';
@@ -104,6 +187,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
$sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
$sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
$sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
+$sql .= " AND date_validated IS NULL";
dol_syslog('htdocs/accountancy/closure/index.php sql='.$sql, LOG_DEBUG);
$resql = $db->query($sql);
diff --git a/htdocs/accountancy/closure/validate.php b/htdocs/accountancy/closure/validate.php
deleted file mode 100644
index 1013ad1b6ce..00000000000
--- a/htdocs/accountancy/closure/validate.php
+++ /dev/null
@@ -1,156 +0,0 @@
-
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see '.img_previous().' ';
-$textnextyear = ' '.img_next().' ';
-
-
-print load_fiche_titre($langs->trans("ValidateMovements")." ".$textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, '', 'title_accountancy');
-
-print $langs->trans("DescValidateMovements").'';
-print '
';
-print '';
-for ($i = 1; $i <= 12; $i++) {
- $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
- if ($j > 12) $j -= 12;
- print ''.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).' ';
-}
-print ''.$langs->trans("Total").' ';
-
-print '';
-$sql = "SELECT COUNT(b.rowid) as detail,";
-for ($i = 1; $i <= 12; $i++) {
- $j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
- if ($j > 12) $j -= 12;
- $sql .= " SUM(".$db->ifsql('MONTH(b.doc_date)='.$j, '1', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
-}
-$sql .= " COUNT(b.rowid) as total";
-$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
-$sql .= " WHERE b.doc_date >= '".$db->idate($search_date_start)."'";
-$sql .= " AND b.doc_date <= '".$db->idate($search_date_end)."'";
-$sql .= " AND b.entity IN (".getEntity('bookkeeping', 0).")"; // We don't share object for accountancy
-
-dol_syslog('htdocs/accountancy/closure/index.php sql='.$sql, LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql) {
- $num = $db->num_rows($resql);
-
- while ($row = $db->fetch_row($resql)) {
- for ($i = 1; $i <= 12; $i++) {
- print ''.$row[$i].' ';
- }
- print ''.$row[13].' ';
-print "
\n";
-
-print '
';
-print '
';
// Ref
- print ''.$langs->trans("Ref").' '.$object->id.' '.$langs->trans("Ref").' '.$object->ref.' ';
$linkend = ' ';
$result .= $linkstart;
- if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
- if ($withpicto != 2) $result .= $this->ref;
+ if ($withpicto) {
+ $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ if ($withpicto != 2) {
+ $result .= $this->ref;
+ }
$result .= $linkend;
return $result;
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index c9aaa856d22..87eec3676f8 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -101,7 +101,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
// List of fields to search into when doing a "search in all"
$fieldstosearchall = array(
- 'd.rowid'=>'Ref',
+ 'd.ref'=>'Ref',
'd.login'=>'Login',
'd.lastname'=>'Lastname',
'd.firstname'=>'Firstname',
@@ -146,12 +146,7 @@ $arrayfields = array(
'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
/*
@@ -235,6 +230,7 @@ if (empty($reshook)) {
$objectlabel = 'Members';
$permissiontoread = $user->rights->adherent->lire;
$permissiontodelete = $user->rights->adherent->supprimer;
+ $permissiontoadd = $user->rights->adherent->creer;
$uploaddir = $conf->adherent->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
@@ -251,7 +247,7 @@ $memberstatic = new Adherent($db);
$now = dol_now();
-$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
+$sql = "SELECT d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe as company, d.fk_soc,";
$sql .= " d.civility, d.datefin, d.address, d.zip, d.town, d.state_id, d.country,";
$sql .= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.skype, d.birth, d.public, d.photo,";
$sql .= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
@@ -268,8 +264,13 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
$sql = preg_replace('/,\s*$/', '', $sql);
$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
-if (!empty($search_categ) || !empty($catid)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member"; // We need this table joined to the select in order to filter by categ
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
+}
+if (!empty($search_categ) || !empty($catid)) {
+ // We need this table joined to the select in order to filter by categ
+ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member";
+}
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = d.country)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
@@ -285,10 +286,12 @@ if ($search_type > 0) $sql .= " AND t.rowid=".$db->escape($search_type);
if ($search_filter == 'withoutsubscription') $sql .= " AND (datefin IS NULL OR t.subscription = 0)";
if ($search_filter == 'uptodate') $sql .= " AND (datefin >= '".$db->idate($now)."' OR t.subscription = 0)";
if ($search_filter == 'outofdate') $sql .= " AND (datefin < '".$db->idate($now)."' AND t.subscription = 1)";
-if ($search_status != '') $sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")"; // Peut valoir un nombre ou liste de nombre separes par virgules
+if ($search_status != '') {
+ // Peut valoir un nombre ou liste de nombre separes par virgules
+ $sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")";
+}
if ($search_ref) {
- if (is_numeric($search_ref)) $sql .= " AND (d.rowid = ".$db->escape($search_ref).")";
- else $sql .= " AND 1 = 2"; // Always wrong
+ $sql .= natural_search("d.ref", $search_ref);
}
if ($search_civility) $sql .= natural_search("d.civility", $search_civility);
if ($search_firstname) $sql .= natural_search("d.firstname", $search_firstname);
@@ -404,7 +407,8 @@ $arrayofmassactions = array(
);
if ($user->rights->adherent->creer) $arrayofmassactions['close'] = $langs->trans("Resiliate");
if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete'] = '';
if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['d.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['d.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], 'd.ref', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['d.civility']['checked'])) print_liste_field_titre($arrayfields['d.civility']['label'], $_SERVER["PHP_SELF"], 'd.civility', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['d.firstname']['checked'])) print_liste_field_titre($arrayfields['d.firstname']['label'], $_SERVER["PHP_SELF"], 'd.firstname', '', $param, '', $sortfield, $sortorder);
if (!empty($arrayfields['d.lastname']['checked'])) print_liste_field_titre($arrayfields['d.lastname']['label'], $_SERVER["PHP_SELF"], 'd.lastname', '', $param, '', $sortfield, $sortorder);
@@ -647,7 +651,7 @@ while ($i < min($num, $limit)) {
$datefin = $db->jdate($obj->datefin);
$memberstatic->id = $obj->rowid;
- $memberstatic->ref = $obj->rowid;
+ $memberstatic->ref = $obj->ref;
$memberstatic->civility_id = $obj->civility;
$memberstatic->lastname = $obj->lastname;
$memberstatic->firstname = $obj->firstname;
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 27c6bbeed73..36f0c572de4 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -187,14 +187,14 @@ print ' '."\n";
print ''."\n";
if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
- if (! getIsHTTPS()) {
+ if (!isHTTPS()) {
$langs->load("errors");
print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
}
print ''.img_picto($langs->trans('Disabled'), 'switch_off').' ';
print ' '."\n";
} else {
- if (! getIsHTTPS()) {
+ if (!isHTTPS()) {
$langs->load("errors");
print img_warning($langs->trans("WarningAvailableOnlyForHTTPSServers"), '', 'valignmiddle size15x').' ';
}
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index d06f8a2ce31..6d9cabc6789 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,7 +8,7 @@
* Copyright (C) 2011 Remy Younes
* Copyright (C) 2012-2015 Marcos García
* Copyright (C) 2012 Christophe Battarel
- * Copyright (C) 2011-2019 Alexandre Spangaro
+ * Copyright (C) 2011-2020 Alexandre Spangaro
* Copyright (C) 2015 Ferran Marcet
* Copyright (C) 2016 Raphaël Doursenaud
* Copyright (C) 2019-2020 Frédéric France
@@ -205,7 +205,7 @@ $tabsql[17] = "SELECT id as rowid, code, label, accountancy_code, active FR
$tabsql[18] = "SELECT rowid as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
$tabsql[19] = "SELECT id as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
$tabsql[20] = "SELECT rowid as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method";
-$tabsql[21] = "SELECT c.rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_availability AS c";
+$tabsql[21] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.position FROM ".MAIN_DB_PREFIX."c_availability AS c";
$tabsql[22] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
$tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
$tabsql[24] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
@@ -250,7 +250,7 @@ $tabsqlsort[17] = "code ASC";
$tabsqlsort[18] = "code ASC, libelle ASC";
$tabsqlsort[19] = "id ASC";
$tabsqlsort[20] = "code ASC, libelle ASC";
-$tabsqlsort[21] = "code ASC, label ASC";
+$tabsqlsort[21] = "code ASC, label ASC, position ASC";
$tabsqlsort[22] = "code ASC, label ASC";
$tabsqlsort[23] = "country ASC, taux ASC";
$tabsqlsort[24] = "code ASC, label ASC";
@@ -295,7 +295,7 @@ $tabfield[17] = "code,label,accountancy_code";
$tabfield[18] = "code,libelle,tracking";
$tabfield[19] = "code,libelle";
$tabfield[20] = "code,libelle";
-$tabfield[21] = "code,label";
+$tabfield[21] = "code,label,position";
$tabfield[22] = "code,label";
$tabfield[23] = "country_id,country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
$tabfield[24] = "code,label";
@@ -340,7 +340,7 @@ $tabfieldvalue[17] = "code,label,accountancy_code";
$tabfieldvalue[18] = "code,libelle,tracking";
$tabfieldvalue[19] = "code,libelle";
$tabfieldvalue[20] = "code,libelle";
-$tabfieldvalue[21] = "code,label";
+$tabfieldvalue[21] = "code,label,position";
$tabfieldvalue[22] = "code,label";
$tabfieldvalue[23] = "country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
$tabfieldvalue[24] = "code,label";
@@ -385,7 +385,7 @@ $tabfieldinsert[17] = "code,label,accountancy_code";
$tabfieldinsert[18] = "code,libelle,tracking";
$tabfieldinsert[19] = "code,libelle";
$tabfieldinsert[20] = "code,libelle";
-$tabfieldinsert[21] = "code,label";
+$tabfieldinsert[21] = "code,label,position";
$tabfieldinsert[22] = "code,label";
$tabfieldinsert[23] = "fk_pays,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
$tabfieldinsert[24] = "code,label";
@@ -523,7 +523,7 @@ $tabhelp[17] = array('code'=>$langs->trans("EnterAnyCode"));
$tabhelp[18] = array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"));
$tabhelp[19] = array('code'=>$langs->trans("EnterAnyCode"));
$tabhelp[20] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
$tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
$tabhelp[23] = array('revenuestamp_type'=>'FixedOrPercent');
$tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 6525013c6bc..e7149ece88d 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -135,12 +135,13 @@ if ($action == 'deletefilter')
{
$emailcollectorfilter = new EmailCollectorFilter($db);
$emailcollectorfilter->fetch(GETPOST('filterid', 'int'));
- $result = $emailcollectorfilter->delete($user);
- if ($result > 0)
- {
- $object->fetchFilters();
- } else {
- setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
+ if ($emailcollectorfilter->id > 0) {
+ $result = $emailcollectorfilter->delete($user);
+ if ($result > 0) {
+ $object->fetchFilters();
+ } else {
+ setEventMessages($emailcollectorfilter->errors, $emailcollectorfilter->error, 'errors');
+ }
}
}
@@ -153,6 +154,11 @@ if (GETPOST('addoperation', 'alpha'))
$emailcollectoroperation->status = 1;
$emailcollectoroperation->position = 50;
+ if ($emailcollectoroperation->type == '-1') {
+ $error++;
+ setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Operation")), null, 'errors');
+ }
+
if (in_array($emailcollectoroperation->type, array('loadthirdparty', 'loadandcreatethirdparty'))
&& empty($emailcollectoroperation->actionparam)) {
$error++;
@@ -200,12 +206,13 @@ if ($action == 'deleteoperation')
{
$emailcollectoroperation = new EmailCollectorAction($db);
$emailcollectoroperation->fetch(GETPOST('operationid', 'int'));
- $result = $emailcollectoroperation->delete($user);
- if ($result > 0)
- {
- $object->fetchActions();
- } else {
- setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+ if ($emailcollectoroperation->id > 0) {
+ $result = $emailcollectoroperation->delete($user);
+ if ($result > 0) {
+ $object->fetchActions();
+ } else {
+ setEventMessages($emailcollectoroperation->errors, $emailcollectoroperation->error, 'errors');
+ }
}
}
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index a93f5c3c608..61688e18515 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -37,7 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
// Load translation files required by the page
$langs->loadLangs(array('admin', 'errors', 'trips', 'other'));
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+ accessforbidden();
+}
$action = GETPOST('action', 'aZ09');
$value = GETPOST('value', 'alpha');
@@ -52,51 +54,47 @@ $type = 'expensereport';
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
$maskconst = GETPOST('maskconst', 'alpha');
$maskvalue = GETPOST('maskvalue', 'alpha');
- if ($maskconst) $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+ if ($maskconst) {
+ $res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+ }
- if (!$res > 0) $error++;
+ if (!$res > 0) {
+ $error++;
+ }
- if (!$error)
- {
+ if (!$error) {
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} else {
setEventMessages($langs->trans("Error"), null, 'errors');
}
-} elseif ($action == 'specimen') // For fiche inter
-{
+} elseif ($action == 'specimen') { // For fiche expensereport
$modele = GETPOST('module', 'alpha');
- $inter = new ExpenseReport($db);
- $inter->initAsSpecimen();
- $inter->status = 0; // Force statut draft to show watermark
- $inter->fk_statut = 0; // Force statut draft to show watermark
+ $expensespecimen = new ExpenseReport($db);
+ $expensespecimen->initAsSpecimen();
+ $expensespecimen->status = 0; // Force statut draft to show watermark
// Search template files
$file = ''; $classname = ''; $filefound = 0;
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
- foreach ($dirmodels as $reldir)
- {
+ foreach ($dirmodels as $reldir) {
$file = dol_buildpath($reldir."core/modules/expensereport/doc/pdf_".$modele.".modules.php", 0);
- if (file_exists($file))
- {
+ if (file_exists($file)) {
$filefound = 1;
$classname = "pdf_".$modele;
break;
}
}
- if ($filefound)
- {
+ if ($filefound) {
require_once $file;
$module = new $classname($db);
- if ($module->write_file($inter, $langs) > 0)
- {
+ if ($module->write_file($expensespecimen, $langs) > 0) {
header("Location: ".DOL_URL_ROOT."/document.php?modulepart=expensereport&file=SPECIMEN.pdf");
return;
} else {
@@ -107,30 +105,22 @@ if ($action == 'updateMask')
setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
}
-}
-
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+ // Activate a model
$ret = addDocumentModel($value, $type, $label, $scandir);
- if ($ret > 0 && empty($conf->global->EXPENSEREPORT_ADDON_PDF))
- {
+ if ($ret > 0 && empty($conf->global->EXPENSEREPORT_ADDON_PDF)) {
dolibarr_set_const($db, 'EXPENSEREPORT_ADDON_PDF', $value, 'chaine', 0, '', $conf->entity);
}
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
$ret = delDocumentModel($value, $type);
- if ($ret > 0)
- {
- if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+ if ($ret > 0) {
+ if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$value") {
+ dolibarr_del_const($db, 'EXPENSEREPORT_ADDON_PDF', $conf->entity);
+ }
}
-}
-
-// Set default model
-elseif ($action == 'setdoc')
-{
- if (dolibarr_set_const($db, "EXPENSEREPORT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity))
- {
+} elseif ($action == 'setdoc') {
+ // Set default model
+ if (dolibarr_set_const($db, "EXPENSEREPORT_ADDON_PDF", $value, 'chaine', 0, '', $conf->entity)) {
// La constante qui a ete lue en avant du nouveau set
// on passe donc par une variable pour avoir un affichage coherent
$conf->global->EXPENSEREPORT_ADDON_PDF = $value;
@@ -138,18 +128,15 @@ elseif ($action == 'setdoc')
// On active le modele
$ret = delDocumentModel($value, $type);
- if ($ret > 0)
- {
+ if ($ret > 0) {
$ret = addDocumentModel($value, $type, $label, $scandir);
}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
// TODO Verifier si module numerotation choisi peut etre active
// par appel methode canBeActivated
dolibarr_set_const($db, "EXPENSEREPORT_ADDON", $value, 'chaine', 0, '', $conf->entity);
-} elseif ($action == 'setoptions')
-{
+} elseif ($action == 'setoptions') {
$db->begin();
$freetext = GETPOST('EXPENSEREPORT_FREE_TEXT', 'restricthtml'); // No alpha here, we want exact string
@@ -158,10 +145,11 @@ elseif ($action == 'setdoc')
$draft = GETPOST('EXPENSEREPORT_DRAFT_WATERMARK', 'alpha');
$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
- if (!$res1 > 0 || !$res2 > 0) $error++;
+ if (!$res1 > 0 || !$res2 > 0) {
+ $error++;
+ }
- if (!$error)
- {
+ if (!$error) {
$db->commit();
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
} else {
@@ -206,19 +194,14 @@ print ''."\n";
clearstatcache();
-foreach ($dirmodels as $reldir)
-{
+foreach ($dirmodels as $reldir) {
$dir = dol_buildpath($reldir."core/modules/expensereport/");
- if (is_dir($dir))
- {
+ if (is_dir($dir)) {
$handle = opendir($dir);
- if (is_resource($handle))
- {
- while (($file = readdir($handle)) !== false)
- {
- if (substr($file, 0, 18) == 'mod_expensereport_' && substr($file, dol_strlen($file) - 3, 3) == 'php')
- {
+ if (is_resource($handle)) {
+ while (($file = readdir($handle)) !== false) {
+ if (substr($file, 0, 18) == 'mod_expensereport_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
$file = substr($file, 0, dol_strlen($file) - 4);
require_once $dir.$file.'.php';
@@ -226,11 +209,14 @@ foreach ($dirmodels as $reldir)
$module = new $file($db);
// Show modules according to features level
- if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
- if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+ if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+ continue;
+ }
+ if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+ continue;
+ }
- if ($module->isEnabled())
- {
+ if ($module->isEnabled()) {
print ''.$module->nom." \n";
print $module->info();
print ' ';
@@ -241,13 +227,15 @@ foreach ($dirmodels as $reldir)
if (preg_match('/^Error/', $tmp)) {
$langs->load("errors");
print ''.$langs->trans($tmp).'
';
- } elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
- else print $tmp;
+ } elseif ($tmp == 'NotConfigured') {
+ print $langs->trans($tmp);
+ } else {
+ print $tmp;
+ }
print ''."\n";
print '';
- if ($conf->global->EXPENSEREPORT_ADDON == $file)
- {
+ if ($conf->global->EXPENSEREPORT_ADDON == $file) {
print img_picto($langs->trans("Activated"), 'switch_on');
} else {
print '';
@@ -266,8 +254,9 @@ foreach ($dirmodels as $reldir)
if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval
$htmltooltip .= ''.$langs->trans("NextValue").': ';
if ($nextval) {
- if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+ if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
$nextval = $langs->trans($nextval);
+ }
$htmltooltip .= $nextval.'
';
print (empty($module->name) ? $name : $module->name);
print " \n";
- if (method_exists($module, 'info')) print $module->info($langs);
- else print $module->description;
+ if (method_exists($module, 'info')) {
+ print $module->info($langs);
+ } else {
+ print $module->description;
+ }
print ' ';
// Active
- if (in_array($name, $def))
- {
+ if (in_array($name, $def)) {
print ''."\n";
print 'scandir.'&label='.urlencode($module->name).'">';
print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -385,8 +370,7 @@ foreach ($dirmodels as $reldir)
// Default
print ' ';
- if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name")
- {
+ if ($conf->global->EXPENSEREPORT_ADDON_PDF == "$name") {
print img_picto($langs->trans("Default"), 'on');
} else {
print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').' ';
@@ -409,8 +393,7 @@ foreach ($dirmodels as $reldir)
// Preview
print ' ';
- if ($module->type == 'pdf')
- {
+ if ($module->type == 'pdf') {
print ''.img_object($langs->trans("Preview"), 'pdf').' ';
} else {
print img_object($langs->trans("PreviewNotAvailable"), 'generic');
@@ -451,14 +434,15 @@ print " '.$langs->trans("AvailableVariables").': ';
print '';
print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").''.$langs->trans('ExpenseReportRulesDesc').' ';
print ' ';
echo '';
- if ($action == 'edit' && $object->id == $rule->id)
- {
+ if ($action == 'edit' && $object->id == $rule->id) {
$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
echo ''.$form->selectarray('apply_to', $tab_apply, $selected, 0).'
';
echo ''.$form->select_dolusers($object->fk_user, 'fk_user').'
';
echo ''.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'
';
} else {
- if ($rule->is_for_all > 0) echo $tab_apply['A'];
- elseif ($rule->fk_usergroup > 0) echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
- elseif ($rule->fk_user > 0) echo $tab_apply['U'].' ('.$rule->getUserName().')';
- }
- echo ' ';
-
-
- echo '';
- if ($action == 'edit' && $object->id == $rule->id)
- {
- echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
- } else {
- if ($rule->fk_c_type_fees == -1) echo $langs->trans('AllExpenseReport');
- else {
- $key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
- if ($key != $langs->trans($key)) echo $langs->trans($key);
- else echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
+ if ($rule->is_for_all > 0) {
+ echo $tab_apply['A'];
+ } elseif ($rule->fk_usergroup > 0) {
+ echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
+ } elseif ($rule->fk_user > 0) {
+ echo $tab_apply['U'].' ('.$rule->getUserName().')';
}
}
echo ' ';
echo '';
- if ($action == 'edit' && $object->id == $rule->id)
- {
+ if ($action == 'edit' && $object->id == $rule->id) {
+ echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
+ } else {
+ if ($rule->fk_c_type_fees == -1) {
+ echo $langs->trans('AllExpenseReport');
+ } else {
+ $key = getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
+ if ($key != $langs->trans($key)) {
+ echo $langs->trans($key);
+ } else {
+ echo $langs->trans(getDictvalue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id')); // TODO check to return trans of 'code'
+ }
+ }
+ }
+ echo ' ';
+
+
+ echo '';
+ if ($action == 'edit' && $object->id == $rule->id) {
echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
} else {
echo $tab_rules_type[$rule->code_expense_rules_type];
@@ -263,8 +279,7 @@ foreach ($rules as $rule)
echo ' ';
- if ($action == 'edit' && $object->id == $rule->id)
- {
+ if ($action == 'edit' && $object->id == $rule->id) {
print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
} else {
echo dol_print_date($rule->dates, 'day');
@@ -273,8 +288,7 @@ foreach ($rules as $rule)
echo ' ';
- if ($action == 'edit' && $object->id == $rule->id)
- {
+ if ($action == 'edit' && $object->id == $rule->id) {
print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
} else {
echo dol_print_date($rule->datee, 'day');
@@ -283,8 +297,7 @@ foreach ($rules as $rule)
echo ' ';
- if ($action == 'edit' && $object->id == $rule->id)
- {
+ if ($action == 'edit' && $object->id == $rule->id) {
echo ' ';
- if ($action == 'edit' && $object->id == $rule->id)
- {
+ if ($action == 'edit' && $object->id == $rule->id) {
echo $form->selectyesno('restrictive', $object->restrictive, 1);
} else {
echo yn($rule->restrictive, 1, 1);
@@ -303,8 +315,7 @@ foreach ($rules as $rule)
echo ' ';
- if ($object->id != $rule->id)
- {
+ if ($object->id != $rule->id) {
echo ''.img_edit().' ';
echo ''.img_delete().' ';
} else {
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index bc6b0dc33ac..6523ec833b3 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/admin/fckeditor.php
* \ingroup fckeditor
- * \brief Page d'activation du module FCKeditor dans les autres modules
+ * \brief Activation page for the FCKeditor module in the other modules
*/
require '../main.inc.php';
@@ -43,35 +43,41 @@ $mode = GETPOST('mode') ?GETPOST('mode', 'alpha') : 'dolibarr_notes';
if (!$user->admin) accessforbidden();
-// Constante et traduction de la description du module
+// Constant and translation of the module description
$modules = array(
-'SOCIETE' => 'FCKeditorForCompany',
-'PRODUCTDESC' => 'FCKeditorForProduct',
-'DETAILS' => 'FCKeditorForProductDetails',
-'USERSIGN' => 'FCKeditorForUserSignature',
-'MAILING' => 'FCKeditorForMailing',
-'MAIL' => 'FCKeditorForMail',
-'TICKET' => 'FCKeditorForTicket'
+ 'SOCIETE' => 'FCKeditorForCompany',
+ 'PRODUCTDESC' => 'FCKeditorForProduct',
+ 'DETAILS' => 'FCKeditorForProductDetails',
+ 'USERSIGN' => 'FCKeditorForUserSignature',
+ 'MAILING' => 'FCKeditorForMailing',
+ 'MAIL' => 'FCKeditorForMail',
+ 'TICKET' => 'FCKeditorForTicket',
+ 'NOTE_PUBLIC' => 'FCKeditorForNotePublic',
+ 'NOTE_PRIVATE' => 'FCKeditorForNotePrivate',
);
-// Conditions pour que l'option soit proposee
+// Conditions for the option to be offered
$conditions = array(
-'SOCIETE' => 1,
-'PRODUCTDESC' => (!empty($conf->product->enabled) || !empty($conf->service->enabled)),
-'DETAILS' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
-'USERSIGN' => 1,
-'MAILING' => !empty($conf->mailing->enabled),
-'MAIL' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
-'TICKET' => !empty($conf->ticket->enabled)
+ 'SOCIETE' => 1,
+ 'PRODUCTDESC' => (!empty($conf->product->enabled) || !empty($conf->service->enabled)),
+ 'DETAILS' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
+ 'USERSIGN' => 1,
+ 'MAILING' => !empty($conf->mailing->enabled),
+ 'MAIL' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
+ 'TICKET' => !empty($conf->ticket->enabled),
+ 'NOTE_PUBLIC' => 1,
+ 'NOTE_PRIVATE' => 1,
);
// Picto
$picto = array(
-'SOCIETE' => 'generic',
-'PRODUCTDESC' => 'product',
-'DETAILS' => 'product',
-'USERSIGN' => 'user',
-'MAILING' => 'email',
-'MAIL' => 'email',
-'TICKET' => 'ticket'
+ 'SOCIETE' => 'generic',
+ 'PRODUCTDESC' => 'product',
+ 'DETAILS' => 'product',
+ 'USERSIGN' => 'user',
+ 'MAILING' => 'email',
+ 'MAIL' => 'email',
+ 'TICKET' => 'ticket',
+ 'NOTE_PUBLIC' => 'generic',
+ 'NOTE_PRIVATE' => 'generic',
);
@@ -85,7 +91,7 @@ foreach ($modules as $const => $desc)
if ($action == 'activate_'.strtolower($const))
{
dolibarr_set_const($db, "FCKEDITOR_ENABLE_".$const, "1", 'chaine', 0, '', $conf->entity);
- // Si fckeditor est active dans la description produit/service, on l'active dans les formulaires
+ // If fckeditor is active in the product/service description, it is activated in the forms
if ($const == 'PRODUCTDESC' && !empty($conf->global->PRODUIT_DESC_IN_FORM))
{
dolibarr_set_const($db, "FCKEDITOR_ENABLE_DETAILS", "1", 'chaine', 0, '', $conf->entity);
@@ -154,7 +160,7 @@ if (empty($conf->use_javascript_ajax))
// Modules
foreach ($modules as $const => $desc)
{
- // Si condition non remplie, on ne propose pas l'option
+ // If this condition is not met, the option is not offered
if (!$conditions[$const]) continue;
print ' ';
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 34da6f7d34e..9132cc4b4d1 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -299,7 +299,7 @@ if (empty($mysoc->country_code))
print ''.$langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
print " x ".$langs->trans("Quantity").": ".$qty;
print " - ".$langs->trans("VAT").": ".$vat.'%';
- print ' -> '.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."'.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]." ';
print '';
print $langs->trans("MailingDelay").' ';
-print ' '.$desc." \n";
+ print ''.$desc." \n";
}
if ($mode == 'marketplace') {
- print ''.$langs->trans("ModulesMarketPlaceDesc")." \n";
+ print ''.$langs->trans("ModulesMarketPlaceDesc")." \n";
}
if ($mode == 'deploy') {
- print ''.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))." \n";
+ print ''.$langs->trans("ModulesDeployDesc", $langs->transnoentitiesnoconv("AvailableModules"))." \n";
}
if ($mode == 'develop') {
- print ''.$langs->trans("ModulesDevelopDesc")." \n";
+ print ''.$langs->trans("ModulesDevelopDesc")." \n";
}
+
$head = modules_prepare_head();
-print "';
$form->select_comptes($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT, 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT', 0, "courant=1", 1);
print ' ';
+/* Moved to bank account data
// ICS
print ''.$langs->trans("ICS").' ';
print '';
print ' ';
print ''.$langs->trans("ResponsibleUser").' ';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index c7bae90b373..1d6d35c8719 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -74,21 +74,23 @@ if ($action == "set")
*/
} else $error++;
- $res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
- if (! ($res > 0)) $error++;
+ /* Moved to account
- if (GETPOST("PRELEVEMENT_USER") > 0) {
- $res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
- if (! ($res > 0)) $error++;
- }
- if (GETPOST("PRELEVEMENT_END_TO_END") || GETPOST("PRELEVEMENT_END_TO_END") == "") {
- $res = dolibarr_set_const($db, "PRELEVEMENT_END_TO_END", GETPOST("PRELEVEMENT_END_TO_END"), 'chaine', 0, '', $conf->entity);
- if (! ($res > 0)) $error++;
- }
- if (GETPOST("PRELEVEMENT_USTRD") || GETPOST("PRELEVEMENT_USTRD") == "") {
- $res = dolibarr_set_const($db, "PRELEVEMENT_USTRD", GETPOST("PRELEVEMENT_USTRD"), 'chaine', 0, '', $conf->entity);
- if (! ($res > 0)) $error++;
- }
+ $res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
+ if (!$res > 0) $error++;
+ */
+ if (GETPOST("PRELEVEMENT_USER") > 0) {
+ $res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
+ if (!$res > 0) $error++;
+ }
+ if (GETPOST("PRELEVEMENT_END_TO_END") || GETPOST("PRELEVEMENT_END_TO_END") == "") {
+ $res = dolibarr_set_const($db, "PRELEVEMENT_END_TO_END", GETPOST("PRELEVEMENT_END_TO_END"), 'chaine', 0, '', $conf->entity);
+ if (!$res > 0) $error++;
+ }
+ if (GETPOST("PRELEVEMENT_USTRD") || GETPOST("PRELEVEMENT_USTRD") == "") {
+ $res = dolibarr_set_const($db, "PRELEVEMENT_USTRD", GETPOST("PRELEVEMENT_USTRD"), 'chaine', 0, '', $conf->entity);
+ if (!$res > 0) $error++;
+ }
$res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
if (! ($res > 0)) $error++;
@@ -146,13 +148,16 @@ print ''.$langs->trans("Parameter").' ';
print ''.$langs->trans("Value").' ';
print "'.$langs->trans("BankToReceiveWithdraw").' ';
print '';
$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'PRELEVEMENT_ID_BANKACCOUNT', 0, "courant=1", 1);
print ' ';
$htmltext = $langs->trans("AskThisIDToYourBank");
print $form->textwithpicto($langs->trans("ICS"), $htmltext);
@@ -161,6 +166,7 @@ print ' ';
print ' ';
print ''.$langs->trans("ResponsibleUser").' ';
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index 80454403a32..1100b86f412 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -224,7 +224,7 @@ if (($thousand != ',' && $thousand != '.') || ($thousand != ' '))
print ' => price(1234.56) '.price(1234.56).' '.$langs->trans("CurrentTimeZone").' '; // Timezone server PHP
$a = getServerTimeZoneInt('now');
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 00c4bdc36dd..2b832910623 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -92,7 +92,15 @@ $date_endday = $tmp['mday'];
$date_endmonth = $tmp['mon'];
$date_endyear = $tmp['year'];
-$arrayfields = array();
+// Add prefix session
+$arrayfields = array(
+ 'e.prefix_session' => array(
+ 'label'=>'UserAgent',
+ 'checked'=>(empty($conf->global->AUDIT_ENABLE_PREFIX_SESSION) ? 0 : 1),
+ 'enabled'=>(empty($conf->global->AUDIT_ENABLE_PREFIX_SESSION) ? 0 : 1),
+ 'position'=>110
+ )
+);
/*
@@ -211,7 +219,7 @@ if ($result)
if ($search_user) $param .= '&search_user='.urlencode($search_user);
if ($search_desc) $param .= '&search_desc='.urlencode($search_desc);
if ($search_ua) $param .= '&search_ua='.urlencode($search_ua);
- if ($search_prefix_sessiona) $param .= '&search_prefix_session='.urlencode($search_prefix_session);
+ if ($search_prefix_session) $param .= '&search_prefix_session='.urlencode($search_prefix_session);
if ($date_startmonth) $param .= "&date_startmonth=".urlencode($date_startmonth);
if ($date_startday) $param .= "&date_startday=".urlencode($date_startday);
if ($date_startyear) $param .= "&date_startyear=".urlencode($date_startyear);
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index e101fb89602..89d170feb60 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -173,7 +173,7 @@ class DolibarrApi
unset($object->name_bis);
unset($object->newref);
- if ($object->table_element != 'ticket') {
+ if (!isset($object->table_element) || $object->table_element != 'ticket') {
unset($object->comments);
}
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index bdf86a5c2c9..2d6a598398c 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -707,7 +707,7 @@ class Documents extends DolibarrApi
if (!empty($createdirifnotexists)) {
if (dol_mkdir($upload_dir) < 0) { // needed by products
- throw new RestException(500, 'Error while trying to create directory.');
+ throw new RestException(500, 'Error while trying to create directory '.$upload_dir);
}
}
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index cb2fdd54d66..17d8916b9aa 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -48,8 +48,8 @@ class Login
* @param int $reset Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access)
* @return array Response status and user token
*
- * @throws RestException 403
- * @throws RestException 500
+ * @throws RestException 403 Access denied
+ * @throws RestException 500 System error
*
* @url GET /
* @url POST /
@@ -109,7 +109,7 @@ class Login
}
// Generate token for user
- $token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY, 1);
+ $token = dol_hash($login.uniqid().(empty($conf->global->MAIN_API_KEY)?'':$conf->global->MAIN_API_KEY), 1);
// We store API token into database
$sql = "UPDATE ".MAIN_DB_PREFIX."user";
@@ -132,7 +132,7 @@ class Login
'code' => 200,
'token' => $token,
'entity' => $tmpuser->entity,
- 'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (generated by a previous call). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
+ 'message' => 'Welcome '.$login.($reset ? ' - Token is new' : ' - This is your token (recorded for your user). You can use it to make any REST API call, or enter it into the DOLAPIKEY field to use the Dolibarr API explorer.')
)
);
}
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 8e2f07ec4fc..7f8e415e4b1 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1146,6 +1146,8 @@ class Categorie extends CommonObject
// First build full array $motherof
//$this->load_motherof(); // Disabled because already done by caller of build_path_from_id_categ
+ // $this->cats[$id_categ] is supposed to be already an array. We just want to complete it with property fullpath and fulllabel
+
// Define fullpath and fulllabel
$this->cats[$id_categ]['fullpath'] = '_'.$id_categ;
$this->cats[$id_categ]['fulllabel'] = $this->cats[$id_categ]['label'];
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index f4b7e12cc30..a5578032a3d 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -35,10 +35,10 @@ $langs->load("categories");
$id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alphanohtml');
-$type = GETPOST('type', 'aZ09'); // Can be int or string
$action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
$confirm = GETPOST('confirm');
$cancel = GETPOST('cancel', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
$socid = (int) GETPOST('socid', 'int');
$label = (string) GETPOST('label', 'alphanohtml');
@@ -56,10 +56,14 @@ if ($id == "") {
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-if ($id > 0) {
- $result = $object->fetch($id);
+$result = $object->fetch($id, $label);
+if ($result <= 0) {
+ dol_print_error($db, $object->error); exit;
}
+$type = $object->type;
+if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+
$extrafields = new ExtraFields($db);
$extrafields->fetch_name_optionals_label($object->table_element);
@@ -74,8 +78,13 @@ $error = 0;
*/
if ($cancel) {
- header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
- exit;
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ } else {
+ header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+ exit;
+ }
}
// Action mise a jour d'une categorie
@@ -98,9 +107,15 @@ if ($action == 'update' && $user->rights->categorie->creer) {
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) $error++;
- if (!$error && $object->update($user) > 0) {
- header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
- exit;
+ if (!$error && $object->update($user) > 0)
+ {
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ } else {
+ header('Location: '.DOL_URL_ROOT.'/categories/viewcat.php?id='.$object->id.'&type='.$type);
+ exit;
+ }
} else {
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -131,6 +146,7 @@ print ' '."\n";
print "\t\t";
@@ -160,26 +160,45 @@ foreach ($fulltree as $key => $val)
$categstatic->ref = $val['label'];
$categstatic->color = $val['color'];
$categstatic->type = $type;
- $li = $categstatic->getNomUrl(1, '', 60, $moreparam.'&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam));
$desc = dol_htmlcleanlastbr($val['description']);
$counter = '';
-
if ($conf->global->CATEGORY_SHOW_COUNTS)
{
// we need only a count of the elements, so it is enough to consume only the id's from the database
- $elements = $categstatic->getObjectsInCateg($type, 1);
+ $elements = $type == Categorie::TYPE_ACCOUNT
+ ? $categstatic->getObjectsInCateg("account", 1) // Categorie::TYPE_ACCOUNT is "bank_account" instead of "account"
+ : $categstatic->getObjectsInCateg($type, 1);
+
$counter = " ".(is_countable($elements) ? count($elements) : '0')." ";
}
$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
+ $li = $categstatic->getNomUrl(1, '', 60, '&backtolist='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.$moreparam));
- $data[] = array(
- 'rowid'=>$val['rowid'],
- 'fk_menu'=>$val['fk_parent'],
- 'entry'=>''
- );
+ $entry = '';
+ $entry .= '';
+
+ $entry .= '';
+ $entry .= ''.$li.' ';
+ $entry .= ' ';
+
+ $entry .= $counter;
+
+ $entry .= '';
+ $entry .= ''.img_view().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_edit().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_delete().' ';
+ $entry .= ' ';
+
+ $entry .= ' ';
+ $entry .= '
';
+
+ $data[] = array('rowid' => $val['rowid'], 'fk_menu' => $val['fk_parent'], 'entry' => $entry);
}
@@ -194,7 +213,6 @@ if (!empty($conf->use_javascript_ajax))
print ' ';
$nbofentries = (count($data) - 1);
-
if ($nbofentries > 0)
{
print '';
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index f64f3be8f9e..536b0c20a2c 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -37,16 +37,18 @@ $langs->loadLangs(array('categories', 'sendings'));
$socid = 0;
$id = GETPOST('id', 'int');
+$label = GETPOST('label', 'alpha');
// Security check
if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-if (!$object->fetch($id) > 0) {
- dol_print_error($db);
- exit;
+$result = $object->fetch($id, $label);
+if ($result <= 0) {
+ dol_print_error($db, $object->error); exit;
}
+
$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
@@ -63,11 +65,11 @@ llxHeader('', $langs->trans('Categories'), '');
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
$head = categories_prepare_head($object, $type);
-
print dol_get_fiche_head($head, 'info', $langs->trans($title), -1, 'category');
+
$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
$linkback = ''.$langs->trans("BackToList").' ';
-$object->next_prev_filter = ' type = '.$type;
+$object->next_prev_filter = ' type = '.$object->type;
$object->ref = $object->label;
$morehtmlref = ''.$langs->trans("Root").' >> ';
$ways = $object->print_all_ways(" >> ", '', 1);
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 73c7664f6c2..6bb5d79980c 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -38,7 +38,6 @@ $langs->loadlangs(array('categories', 'bills'));
$id = GETPOST('id', 'int');
$label = GETPOST('label', 'alpha');
-$type = GETPOST('type');
$action = GETPOST('action', 'aZ09');
$confirm = GETPOST('confirm');
@@ -52,18 +51,16 @@ if ($id == '' && $label == '')
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
+$result = $object->fetch($id, $label);
if ($result <= 0) {
dol_print_error($db, $object->error); exit;
}
-$object->fetch_optionals();
-if ($result <= 0) {
- dol_print_error($db, $object->error); exit;
-}
-$upload_dir = $conf->categorie->multidir_output[$object->entity];
+$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+$upload_dir = $conf->categorie->multidir_output[$object->entity];
+
/*
* Actions
*/
@@ -115,8 +112,6 @@ if ($object->id)
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
$head = categories_prepare_head($object, $type);
-
-
print dol_get_fiche_head($head, 'photos', $langs->trans($title), -1, 'category');
$linkback = '
'.$langs->trans("BackToList").' ';
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 423819c49ac..898484d0d51 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -39,7 +39,6 @@ $id = GETPOST('id', 'int');
$label = GETPOST('label', 'alpha');
$action = GETPOST('action', 'aZ09');
$cancel = GETPOST('cancel', 'alpha');
-$type = GETPOST('type', 'aZ09');
if ($id == '' && $label == '')
{
@@ -51,15 +50,12 @@ if ($id == '' && $label == '')
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
-if ($result <= 0) {
- dol_print_error($db, $object->error); exit;
-}
-$object->fetch_optionals();
+$result = $object->fetch($id, $label);
if ($result <= 0) {
dol_print_error($db, $object->error); exit;
}
+$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
/*
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 864de6e2e98..93b162e4f28 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -38,7 +38,6 @@ $langs->load("categories");
$id = GETPOST('id', 'int');
$label = GETPOST('label', 'alpha');
-$type = GETPOST('type', 'aZ09');
$removeelem = GETPOST('removeelem', 'int');
$elemid = GETPOST('elemid', 'int');
@@ -73,19 +72,12 @@ if ($id == "" && $label == "")
$result = restrictedArea($user, 'categorie', $id, '&category');
$object = new Categorie($db);
-$result = $object->fetch($id, $label, $type);
-if ($result <= 0) {
- dol_print_error($db, $object->error); exit;
-}
-$object->fetch_optionals();
+$result = $object->fetch($id, $label);
if ($result <= 0) {
dol_print_error($db, $object->error); exit;
}
-$objecttype = $object->type;
-if (is_numeric($objecttype)) $objecttype = Categorie::$MAP_ID_TO_CODE[$objecttype];
-if ($type === '') $type = $objecttype;
-
+$type = $object->type;
if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
$extrafields = new ExtraFields($db);
@@ -94,16 +86,18 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('categorycard', 'globalcard'));
-// Protection when type provided is not similare to type of category
-if ($objecttype != $type) {
- print 'Error: Value for type parameter does not match value of the type of the category with id='.$id;
- exit;
-}
-
/*
* Actions
*/
+if ($confirm == 'no')
+{
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ }
+}
+
$parameters = array();
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
// Remove element from category
@@ -164,8 +158,13 @@ if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confi
{
if ($object->delete($user) >= 0)
{
- header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
- exit;
+ if ($backtopage) {
+ header("Location: ".$backtopage);
+ exit;
+ } else {
+ header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
+ exit;
+ }
} else {
setEventMessages($object->error, $object->errors, 'errors');
}
@@ -226,9 +225,8 @@ llxHeader("", $langs->trans("Categories"), $helpurl, '', 0, 0, $arrayofjs, $arra
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
$head = categories_prepare_head($object, $type);
-
-
print dol_get_fiche_head($head, 'card', $langs->trans($title), -1, 'category');
+
$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
$linkback = '
'.$langs->trans("BackToList").' ';
$object->next_prev_filter = ' type = '.$object->type;
@@ -250,7 +248,11 @@ dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'la
if ($action == 'delete')
{
- print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type, $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
+ if ($backtopage) {
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&backtopage='.urlencode($backtopage), $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 2);
+ } else {
+ print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type, $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 1);
+ }
}
print '
';
@@ -294,7 +296,7 @@ if ($user->rights->categorie->creer)
if ($user->rights->categorie->supprimer)
{
- print '
id.'&type='.$type.'">'.$langs->trans("Delete").' ';
+ print '
id.'&type='.$type.'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").' ';
}
print "
".(is_countable($elements) ? count($elements) : '0')." ";
}
- $color = $categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"';
+ $color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
+ $li = $categstatic->getNomUrl(1, '', 60, '&backtolist='.urlencode($_SERVER["PHP_SELF"].'?id='.$id.'&type='.$type));
$entry = '';
$entry .= '';
$entry .= '';
- $entry .= ''.$categstatic->getNomUrl(1, '', 60).' ';
+ $entry .= ''.$li.' ';
$entry .= ' ';
- $entry .= ''.$counter.' ';
+ $entry .= $counter;
$entry .= '';
- $entry .= ''.img_view().' ';
+ $entry .= ''.img_view().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_edit().' ';
+ $entry .= ' ';
+ $entry .= '';
+ $entry .= ''.img_delete().' ';
$entry .= ' ';
$entry .= ' ';
@@ -409,7 +417,8 @@ if ($cats < 0)
$data[] = array('rowid' => $val['rowid'], 'fk_menu' => $val['fk_parent'], 'entry' => $entry);
}
- if ((count($data) - 1))
+ $nbofentries = (count($data) - 1);
+ if ($nbofentries > 0)
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
print '';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 510fa67dcdb..7fc58b73c9f 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -141,14 +141,8 @@ $arrayfields = array(
'a.tms'=>array('label'=>'DateModification', 'checked'=>0)
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -239,6 +233,7 @@ if (empty($reshook))
$uploaddir = true;
// Only users that can delete any event can remove records.
$permissiontodelete = $user->rights->agenda->allactions->delete;
+ $permissiontoadd = $user->rights->agenda->myactions->create;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
}
@@ -302,7 +297,8 @@ if ($user->rights->agenda->allactions->delete)
{
$arrayofmassactions['predelete'] = ''.$langs->trans("MailUnsubcribe").' ';
$onlinepaymentenabled = 0;
- if (!empty($conf->paypal->enabled)) $onlinepaymentenabled++;
- if (!empty($conf->paybox->enabled)) $onlinepaymentenabled++;
- if (!empty($conf->stripe->enabled)) $onlinepaymentenabled++;
- if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN))
- {
+ if (!empty($conf->paypal->enabled)) {
+ $onlinepaymentenabled++;
+ }
+ if (!empty($conf->paybox->enabled)) {
+ $onlinepaymentenabled++;
+ }
+ if (!empty($conf->stripe->enabled)) {
+ $onlinepaymentenabled++;
+ }
+ if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
- if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
- {
+ if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
@@ -235,21 +235,32 @@ if (empty($reshook))
}
}
/* For backward compatibility, deprecated */
- if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN))
- {
+ if (!empty($conf->paypal->enabled) && !empty($conf->global->PAYPAL_SECURITY_TOKEN)) {
$substitutionarray['__SECUREKEYPAYPAL__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+ $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ } else {
+ $substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+ }
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+ $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ } else {
+ $substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'order'.$obj->source_id, 2);
+ }
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+ $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ } else {
+ $substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
+ }
- if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
- else $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
+ if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) {
+ $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+ } else {
+ $substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);
+ }
}
//$substitutionisok=true;
@@ -263,10 +274,8 @@ if (empty($reshook))
$arr_css = array();
$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
$arr_file[] = $listofpaths[$key]['fullname'];
$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
$arr_name[] = $listofpaths[$key]['name'];
@@ -277,8 +286,7 @@ if (empty($reshook))
$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
- if ($mail->error)
- {
+ if ($mail->error) {
$res = 0;
}
/*if (! $substitutionisok)
@@ -288,13 +296,11 @@ if (empty($reshook))
}*/
// Send mail
- if ($res)
- {
+ if ($res) {
$res = $mail->sendfile();
}
- if ($res)
- {
+ if ($res) {
// Mail successful
$nbok++;
@@ -303,19 +309,16 @@ if (empty($reshook))
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql .= " SET statut=1, date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
$resql2 = $db->query($sql);
- if (!$resql2)
- {
+ if (!$resql2) {
dol_print_error($db);
} else {
//if cheack read is use then update prospect contact status
- if (strpos($message, '__CHECK_READ__') !== false)
- {
+ if (strpos($message, '__CHECK_READ__') !== false) {
//Update status communication of thirdparty prospect
$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$obj->rowid.")";
dol_syslog("card.php: set prospect thirdparty status", LOG_DEBUG);
$resql2 = $db->query($sql);
- if (!$resql2)
- {
+ if (!$resql2) {
dol_print_error($db);
}
@@ -324,17 +327,15 @@ if (empty($reshook))
dol_syslog("card.php: set prospect contact status", LOG_DEBUG);
$resql2 = $db->query($sql);
- if (!$resql2)
- {
+ if (!$resql2) {
dol_print_error($db);
}
}
}
- if (!empty($conf->global->MAILING_DELAY))
- {
+ if (!empty($conf->global->MAILING_DELAY)) {
dol_syslog("Wait a delay of MAILING_DELAY=".$conf->global->MAILING_DELAY);
- sleep($conf->global->MAILING_DELAY);
+ usleep((float) $conf->global->MAILING_DELAY * 1000000);
}
//test if CHECK READ change statut prospect contact
@@ -347,8 +348,7 @@ if (empty($reshook))
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql .= " SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".$obj->rowid;
$resql2 = $db->query($sql);
- if (!$resql2)
- {
+ if (!$resql2) {
dol_print_error($db);
}
}
@@ -360,14 +360,15 @@ if (empty($reshook))
}
// Loop finished, set global statut of mail
- if ($nbko > 0)
- {
+ if ($nbko > 0) {
$statut = 2; // Status 'sent partially' (because at least one error)
- if ($nbok > 0) setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
- else setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+ if ($nbok > 0) {
+ setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+ } else {
+ setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
+ }
} else {
- if ($nbok >= $num)
- {
+ if ($nbok >= $num) {
$statut = 3; // Send to everybody
setEventMessages($langs->transnoentitiesnoconv("EMailSentToNRecipients", $nbok), null, 'mesgs');
} else {
@@ -379,8 +380,7 @@ if (empty($reshook))
$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$object->id;
dol_syslog("comm/mailing/card.php: update global status", LOG_DEBUG);
$resql2 = $db->query($sql);
- if (!$resql2)
- {
+ if (!$resql2) {
dol_print_error($db);
}
} else {
@@ -393,24 +393,23 @@ if (empty($reshook))
}
// Action send test emailing
- if ($action == 'send' && empty($_POST["cancel"]))
- {
+ if ($action == 'send' && empty($_POST["cancel"])) {
$error = 0;
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
$object->sendto = $_POST["sendto"];
- if (!$object->sendto)
- {
+ if (!$object->sendto) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTo")), null, 'errors');
$error++;
}
- if (!$error)
- {
+ if (!$error) {
// Is the message in html
$msgishtml = -1; // Unknow by default
- if (preg_match('/[\s\t]*/i', $object->body)) $msgishtml = 1;
+ if (preg_match('/[\s\t]*/i', $object->body)) {
+ $msgishtml = 1;
+ }
// other are set at begin of page
$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
@@ -427,15 +426,17 @@ if (empty($reshook))
$arr_css = array();
// Add CSS
- if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
- if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
+ if (!empty($object->bgcolor)) {
+ $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
+ }
+ if (!empty($object->bgimage)) {
+ $arr_css['bgimage'] = $object->bgimage;
+ }
// Attached files
$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
$arr_file[] = $listofpaths[$key]['fullname'];
$arr_mime[] = dol_mimetype($listofpaths[$key]['name']);
$arr_name[] = $listofpaths[$key]['name'];
@@ -446,8 +447,7 @@ if (empty($reshook))
$mailfile = new CMailFile($tmpsujet, $object->sendto, $object->email_from, $tmpbody, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $object->email_errorsto, $arr_css, $trackid, '', 'emailing');
$result = $mailfile->sendfile();
- if ($result)
- {
+ if ($result) {
setEventMessages($langs->trans("MailSuccessfulySent", $mailfile->getValidAddress($object->email_from, 2), $mailfile->getValidAddress($object->sendto, 2)), null, 'mesgs');
$action = '';
} else {
@@ -458,18 +458,17 @@ if (empty($reshook))
}
// Action add emailing
- if ($action == 'add')
- {
+ if ($action == 'add') {
$mesgs = array();
- $object->email_from = GETPOST("from", "none"); // Must allow 'name '
- $object->email_replyto = GETPOST("replyto", "none"); // Must allow 'name '
- $object->email_errorsto = GETPOST("errorsto", "none"); // Must allow 'name '
- $object->title = GETPOST("title");
- $object->sujet = GETPOST("sujet");
- $object->body = GETPOST("bodyemail", 'restricthtml');
- $object->bgcolor = GETPOST("bgcolor");
- $object->bgimage = GETPOST("bgimage");
+ $object->email_from = (string) GETPOST("from", "none"); // Must allow 'name '
+ $object->email_replyto = (string) GETPOST("replyto", "none"); // Must allow 'name '
+ $object->email_errorsto = (string) GETPOST("errorsto", "none"); // Must allow 'name '
+ $object->title = (string) GETPOST("title");
+ $object->sujet = (string) GETPOST("sujet");
+ $object->body = (string) GETPOST("bodyemail", 'restricthtml');
+ $object->bgcolor = (string) GETPOST("bgcolor");
+ $object->bgimage = (string) GETPOST("bgimage");
if (!$object->title) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
@@ -481,10 +480,8 @@ if (empty($reshook))
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
}
- if (!count($mesgs))
- {
- if ($object->create($user) >= 0)
- {
+ if (!count($mesgs)) {
+ if ($object->create($user) >= 0) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
@@ -496,24 +493,25 @@ if (empty($reshook))
}
// Action update description of emailing
- if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
- {
+ if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto') {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
- if ($action == 'settitle') $object->title = trim(GETPOST('title', 'alpha'));
- elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name '
- elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name '
- elseif ($action == 'setemail_errorsto') $object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name '
- elseif ($action == 'settitle' && empty($object->title)) {
+ if ($action == 'settitle') {
+ $object->title = trim(GETPOST('title', 'alpha'));
+ } elseif ($action == 'setemail_from') {
+ $object->email_from = trim(GETPOST('email_from', 'none')); // Must allow 'name '
+ } elseif ($action == 'setemail_replyto') {
+ $object->email_replyto = trim(GETPOST('email_replyto', 'none')); // Must allow 'name '
+ } elseif ($action == 'setemail_errorsto') {
+ $object->email_errorsto = trim(GETPOST('email_errorsto', 'none')); // Must allow 'name '
+ } elseif ($action == 'settitle' && empty($object->title)) {
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
} elseif ($action == 'setfrom' && empty($object->email_from)) {
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
}
- if (!$mesg)
- {
- if ($object->update($user) >= 0)
- {
+ if (!$mesg) {
+ if ($object->update($user) >= 0) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
@@ -527,8 +525,7 @@ if (empty($reshook))
/*
* Add file in email form
*/
- if (!empty($_POST['addfile']))
- {
+ if (!empty($_POST['addfile'])) {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -540,8 +537,7 @@ if (empty($reshook))
}
// Action of file remove
- if (!empty($_POST["removedfile"]))
- {
+ if (!empty($_POST["removedfile"])) {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -552,20 +548,18 @@ if (empty($reshook))
}
// Action of emailing update
- if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
- {
+ if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"])) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$isupload = 0;
- if (!$isupload)
- {
+ if (!$isupload) {
$mesgs = array();
- $object->sujet = GETPOST("sujet");
- $object->body = GETPOST("bodyemail", 'restricthtml');
- $object->bgcolor = GETPOST("bgcolor");
- $object->bgimage = GETPOST("bgimage");
+ $object->sujet = (string) GETPOST("sujet");
+ $object->body = (string) GETPOST("bodyemail", 'restricthtml');
+ $object->bgcolor = (string) GETPOST("bgcolor");
+ $object->bgimage = (string) GETPOST("bgimage");
if (!$object->sujet) {
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTopic"));
@@ -574,10 +568,8 @@ if (empty($reshook))
$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailMessage"));
}
- if (!count($mesgs))
- {
- if ($object->update($user) >= 0)
- {
+ if (!count($mesgs)) {
+ if ($object->update($user) >= 0) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
@@ -592,10 +584,8 @@ if (empty($reshook))
}
// Action of validation confirmation
- if ($action == 'confirm_valid' && $confirm == 'yes')
- {
- if ($object->id > 0)
- {
+ if ($action == 'confirm_valid' && $confirm == 'yes') {
+ if ($object->id > 0) {
$object->valid($user);
setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -606,13 +596,10 @@ if (empty($reshook))
}
// Action of validation confirmation
- if ($action == 'confirm_settodraft' && $confirm == 'yes')
- {
- if ($object->id > 0)
- {
+ if ($action == 'confirm_settodraft' && $confirm == 'yes') {
+ if ($object->id > 0) {
$result = $object->setStatut(0);
- if ($result > 0)
- {
+ if ($result > 0) {
//setEventMessages($langs->trans("MailingSuccessfullyValidated"), null, 'mesgs');
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
@@ -625,20 +612,16 @@ if (empty($reshook))
}
// Resend
- if ($action == 'confirm_reset' && $confirm == 'yes')
- {
- if ($object->id > 0)
- {
+ if ($action == 'confirm_reset' && $confirm == 'yes') {
+ if ($object->id > 0) {
$db->begin();
$result = $object->valid($user);
- if ($result > 0)
- {
+ if ($result > 0) {
$result = $object->reset_targets_status($user);
}
- if ($result > 0)
- {
+ if ($result > 0) {
$db->commit();
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
@@ -652,18 +635,15 @@ if (empty($reshook))
}
// Action of delete confirmation
- if ($action == 'confirm_delete' && $confirm == 'yes')
- {
- if ($object->delete($object->id))
- {
+ if ($action == 'confirm_delete' && $confirm == 'yes') {
+ if ($object->delete($object->id)) {
$url = (!empty($urlfrom) ? $urlfrom : 'list.php');
header("Location: ".$url);
exit;
}
}
- if (!empty($_POST["cancel"]))
- {
+ if (!empty($_POST["cancel"])) {
$action = '';
}
}
@@ -677,24 +657,30 @@ $form = new Form($db);
$htmlother = new FormOther($db);
$help_url = 'EN:Module_EMailing|FR:Module_Mailing|ES:Módulo_Mailing';
-llxHeader('', $langs->trans("Mailing"), $help_url, '', 0, 0,
+llxHeader(
+ '',
+ $langs->trans("Mailing"),
+ $help_url,
+ '',
+ 0,
+ 0,
array(
- '/includes/ace/src/ace.js',
- '/includes/ace/src/ext-statusbar.js',
- '/includes/ace/src/ext-language_tools.js',
- //'/includes/ace/src/ext-chromevox.js'
- ), array());
+ '/includes/ace/src/ace.js',
+ '/includes/ace/src/ext-statusbar.js',
+ '/includes/ace/src/ext-language_tools.js',
+ //'/includes/ace/src/ext-chromevox.js'
+ ),
+ array()
+);
-if ($action == 'create')
-{
+if ($action == 'create') {
// EMailing in creation mode
print '';
} else {
- if ($object->id > 0)
- {
+ if ($object->id > 0) {
$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
$head = emailing_prepare_head($object);
- // Confirmation back to draft
- if ($action == 'settodraft')
- {
+ if ($action == 'settodraft') {
+ // Confirmation back to draft
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("SetToDraft"), $langs->trans("ConfirmUnvalidateEmailing"), "confirm_settodraft", '', '', 1);
- }
- // Confirmation of mailing validation
- if ($action == 'valid')
- {
+ } elseif ($action == 'valid') {
+ // Confirmation of mailing validation
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
- } // Confirm reset
- elseif ($action == 'reset')
- {
+ } elseif ($action == 'reset') {
+ // Confirm reset
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ResetMailing"), $langs->trans("ConfirmResetMailing", $object->ref), "confirm_reset", '', '', 2);
- } // Confirm delete
- elseif ($action == 'delete')
- {
+ } elseif ($action == 'delete') {
+ // Confirm delete
print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id.(!empty($urlfrom) ? '&urlfrom='.urlencode($urlfrom) : ''), $langs->trans("DeleteAMailing"), $langs->trans("ConfirmDeleteMailing"), "confirm_delete", '', '', 1);
}
-
- if ($action != 'edit' && $action != 'edithtml')
- {
+ if ($action != 'edit' && $action != 'edithtml') {
print dol_get_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
/*
* View mode mailing
*/
- if ($action == 'sendall')
- {
+ if ($action == 'sendall') {
// Define message to recommand from command line
$sendingmode = $conf->global->EMAILING_MAIL_SENDMODE;
- if (empty($sendingmode)) $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
- if (empty($sendingmode)) $sendingmode = 'mail'; // If not defined, we use php mail function
+ if (empty($sendingmode)) {
+ $sendingmode = $conf->global->MAIN_MAIL_SENDMODE;
+ }
+ if (empty($sendingmode)) {
+ $sendingmode = 'mail'; // If not defined, we use php mail function
+ }
// MAILING_NO_USING_PHPMAIL may be defined or not.
// MAILING_LIMIT_SENDBYWEB is always defined to something != 0 (-1=forbidden).
// MAILING_LIMIT_SENDBYCLI may be defined ot not (-1=forbidden, 0 or undefined=no limit).
- if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail')
- {
+ if (!empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
// EMailing feature may be a spam problem, so when you host several users/instance, having this option may force each user to use their own SMTP agent.
// You ensure that every user is using its own SMTP server when using the mass emailing module.
$linktoadminemailbefore = '';
$linktoadminemailend = ' ';
setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
- if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+ if (!empty($conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS)) {
+ setEventMessages($langs->trans("MailSendSetupIs3", $conf->global->MAILING_SMTP_SETUP_EMAILS_FOR_QUESTIONS), null, 'warnings');
+ }
$_GET["action"] = '';
} elseif ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
- if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
- if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+ }
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ }
// The feature is forbidden from GUI, we show just message to use from command line.
setEventMessages($langs->trans("MailingNeedCommand"), null, 'warnings');
setEventMessages('', null, 'warnings');
- if ($conf->file->mailing_limit_sendbyweb != '-1') // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
- {
+ if ($conf->file->mailing_limit_sendbyweb != '-1') { // MAILING_LIMIT_SENDBYWEB was set to -1 in database, but it is allowed ot increase it.
setEventMessages($langs->trans("MailingNeedCommand2"), null, 'warnings'); // You can send online with constant...
}
$_GET["action"] = '';
} else {
- if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
- if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_PHPMAIL) && $sendingmode == 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_PHPMAIL), null, 'warnings');
+ }
+ if (!empty($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL) && $sendingmode != 'mail') {
+ setEventMessages($langs->transnoentitiesnoconv($conf->global->MAILING_LIMIT_WARNING_NOPHPMAIL), null, 'warnings');
+ }
$text = '';
- if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0)
- {
+ if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0) {
$text .= $langs->trans("MailingNeedCommand");
$text .= '';
$nbemail = ($object->nbemail ? $object->nbemail : 0);
- if (is_numeric($nbemail))
- {
+ if (is_numeric($nbemail)) {
$text = '';
- if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
- {
- if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
- {
+ if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail))) {
+ if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
} else {
$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
- if (empty($nbemail)) $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
- if ($text)
- {
+ if (empty($nbemail)) {
+ $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
+ }
+ if ($text) {
print $form->textwithpicto($nbemail, $text, 1, 'warning');
} else {
print $nbemail;
@@ -926,8 +912,7 @@ if ($action == 'create')
// Clone confirmation
- if ($action == 'clone')
- {
+ if ($action == 'clone') {
// Create an array for form
$formquestion = array(
'text' => $langs->trans("ConfirmClone"),
@@ -942,81 +927,67 @@ if ($action == 'create')
* Actions Buttons
*/
- if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test')))
- {
+ if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test'))) {
print "\n\n\n";
- if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id))
- {
+ if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id)) {
print '
'.$langs->trans("SetToDraft").' ';
}
- if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer)
- {
- if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
- {
+ if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer) {
+ if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING)) {
print '
'.$langs->trans("EditWithEditor").' ';
} else {
print '
'.$langs->trans("EditWithTextEditor").' ';
}
- if (!empty($conf->use_javascript_ajax)) print '
'.$langs->trans("EditHTMLSource").' ';
+ if (!empty($conf->use_javascript_ajax)) {
+ print '
'.$langs->trans("EditHTMLSource").' ';
+ }
}
//print '
'.$langs->trans("PreviewMailing").' ';
- if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
- {
+ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
print '
'.$langs->trans("TestMailing").' ';
} else {
print '
'.$langs->trans("TestMailing").' ';
}
- if ($object->statut == 0)
- {
- if ($object->nbemail <= 0)
- {
+ if ($object->statut == 0) {
+ if ($object->nbemail <= 0) {
print '
'.$langs->trans("ValidMailing").' ';
- } elseif (empty($user->rights->mailing->valider))
- {
+ } elseif (empty($user->rights->mailing->valider)) {
print '
'.$langs->trans("ValidMailing").' ';
} else {
print '
'.$langs->trans("ValidMailing").' ';
}
}
- if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider)
- {
- if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0)
- {
+ if (($object->statut == 1 || $object->statut == 2) && $object->nbemail > 0 && $user->rights->mailing->valider) {
+ if ($conf->global->MAILING_LIMIT_SENDBYWEB < 0) {
print '
'.$langs->trans("SendMailing").' ';
- } elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
- {
+ } elseif (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
print '
'.$langs->trans("SendMailing").' ';
} else {
print '
'.$langs->trans("SendMailing").' ';
}
}
- if ($user->rights->mailing->creer)
- {
+ if ($user->rights->mailing->creer) {
print '
'.$langs->trans("ToClone").' ';
}
- if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider)
- {
- if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send)
- {
+ if (($object->statut == 2 || $object->statut == 3) && $user->rights->mailing->valider) {
+ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->send) {
print '
'.$langs->trans("ResetMailing").' ';
} else {
print '
'.$langs->trans("ResetMailing").' ';
}
}
- if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer)
- {
- if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete))
- {
+ if (($object->statut <= 1 && $user->rights->mailing->creer) || $user->rights->mailing->supprimer) {
+ if ($object->statut > 0 && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->rights->mailing->mailing_advance->delete)) {
print '
'.$langs->trans("DeleteMailing").' ';
} else {
print '
'.$langs->trans("DeleteMailing").' ';
@@ -1027,8 +998,7 @@ if ($action == 'create')
}
// Display of the TEST form
- if ($action == 'test')
- {
+ if ($action == 'test') {
print '
';
print load_fiche_titre($langs->trans("TestMailing"));
@@ -1070,8 +1040,7 @@ if ($action == 'create')
$htmltext = '
'.$langs->trans("FollowingConstantsWillBeSubstituted").': ';
@@ -1090,10 +1059,8 @@ if ($action == 'create')
print '
'.$langs->trans("MailFile").' ';
// List of files
$listofpaths = dol_dir_list($upload_dir, 'all', 0, '', '', 'name', SORT_ASC, 0);
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
print img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
print ' '.$langs->trans("BackgroundColorByDefault").' ';
- print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
- print ' ';*/
+ print $htmlother->selectColor($object->bgcolor,'bgcolor','',0);
+ print '
';*/
print '
';
// Message
print '';
- if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff') // CKEditor does not apply the color of the div into its content area
- {
+ if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff') { // CKEditor does not apply the color of the div into its content area
$readonly = 1;
// wysiwyg editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
$doleditor->Create();
- } else print dol_htmlentitiesbr($object->body);
+ } else {
+ print dol_htmlentitiesbr($object->body);
+ }
print '
';
print dol_get_fiche_end();
@@ -1132,7 +1100,9 @@ if ($action == 'create')
$linkback = ''.$langs->trans("BackToList").' ';
$morehtmlright = '';
- if ($object->statut == 2) $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+ if ($object->statut == 2) {
+ $morehtmlright .= ' ('.$object->countNbOfTargets('alreadysent').'/'.$object->nbemail.') ';
+ }
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
@@ -1160,21 +1130,19 @@ if ($action == 'create')
print $langs->trans("TotalNbOfDistinctRecipients");
print '';
$nbemail = ($object->nbemail ? $object->nbemail : 0);
- if (is_numeric($nbemail))
- {
+ if (is_numeric($nbemail)) {
$text = '';
- if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2))
- {
- if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
- {
+ if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || $object->statut == 2)) {
+ if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
} else {
$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
}
}
- if (empty($nbemail)) $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
- if ($text)
- {
+ if (empty($nbemail)) {
+ $nbemail .= ' '.img_warning('').' '.$langs->trans("NoTargetYet").' ';
+ }
+ if ($text) {
print $form->textwithpicto($nbemail, $text, 1, 'warning');
} else {
print $nbemail;
@@ -1186,8 +1154,7 @@ if ($action == 'create')
$parameters = array();
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- if (empty($reshook))
- {
+ if (empty($reshook)) {
print $object->showOptionals($extrafields, 'edit', $parameters);
}
@@ -1206,8 +1173,7 @@ if ($action == 'create')
print ''.$langs->trans("FollowingConstantsWillBeSubstituted").': ';
@@ -1241,10 +1207,8 @@ if ($action == 'create')
$out .= ' });';
$out .= '})';
$out .= ''."\n";
- if (count($listofpaths))
- {
- foreach ($listofpaths as $key => $val)
- {
+ if (count($listofpaths)) {
+ foreach ($listofpaths as $key => $val) {
$out .= '';
$out .= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name'];
$out .= '
';
@@ -1270,15 +1234,13 @@ if ($action == 'create')
// Message
print '
';
- if ($action == 'edit')
- {
+ if ($action == 'edit') {
// wysiwyg editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
$doleditor->Create();
}
- if ($action == 'edithtml')
- {
+ if ($action == 'edithtml') {
// HTML source editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 0d621dfa186..bcf1e9c1e3b 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -131,8 +131,8 @@ if (GETPOST('exportcsv', 'int'))
header('Content-Disposition: attachment;filename='.$completefilename);
// List of selected targets
- $sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut, mc.date_envoi, mc.tms,";
- $sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
+ $sql = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut as status, mc.date_envoi, mc.tms,";
+ $sql .= " mc.source_id, mc.source_type, mc.error_text";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.fk_mailing=".$object->id;
$sql .= $db->order($sortfield, $sortorder);
@@ -146,16 +146,16 @@ if (GETPOST('exportcsv', 'int'))
while ($obj = $db->fetch_object($resql))
{
print $obj->rowid.$sep;
- print $obj->lastname.$sep;
- print $obj->firstname.$sep;
+ print '"'.$obj->lastname.'"'.$sep;
+ print '"'.$obj->firstname.'"'.$sep;
print $obj->email.$sep;
print $obj->other.$sep;
- print $obj->date_envoi.$sep;
print $obj->tms.$sep;
- print $obj->source_url.$sep;
- print $obj->source_id.$sep;
print $obj->source_type.$sep;
- print $obj->error_text.$sep;
+ print $obj->source_id.$sep;
+ print $obj->date_envoi.$sep;
+ print $obj->status.$sep;
+ print '"'.$obj->error_text.'"'.$sep;
print "\n";
}
@@ -463,24 +463,51 @@ if ($object->fetch($id) >= 0)
$sql .= " mc.source_url, mc.source_id, mc.source_type, mc.error_text";
$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
$sql .= " WHERE mc.fk_mailing=".$object->id;
- if ($search_lastname) $sql .= natural_search("mc.lastname", $search_lastname);
- if ($search_firstname) $sql .= natural_search("mc.firstname", $search_firstname);
- if ($search_email) $sql .= natural_search("mc.email", $search_email);
- if ($search_other) $sql .= natural_search("mc.other", $search_other);
- if ($search_dest_status != '' && $search_dest_status >= -1) $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+ $asearchcriteriahasbeenset = 0;
+ if ($search_lastname) {
+ $sql .= natural_search("mc.lastname", $search_lastname);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_firstname) {
+ $sql .= natural_search("mc.firstname", $search_firstname);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_email) {
+ $sql .= natural_search("mc.email", $search_email);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_other) {
+ $sql .= natural_search("mc.other", $search_other);
+ $asearchcriteriahasbeenset++;
+ }
+ if ($search_dest_status != '' && $search_dest_status >= -1) {
+ $sql .= " AND mc.statut=".$db->escape($search_dest_status)." ";
+ $asearchcriteriahasbeenset++;
+ }
$sql .= $db->order($sortfield, $sortorder);
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
{
- $result = $db->query($sql);
- $nbtotalofrecords = $db->num_rows($result);
- if (($page * $limit) > $nbtotalofrecords) // if total resultset is smaller then paging size (filtering), goto and load page 0
- {
- $page = 0;
- $offset = 0;
- }
+ $result = $db->query($sql);
+ $nbtotalofrecords = $db->num_rows($result);
+ if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+ $page = 0;
+ $offset = 0;
+ }
+
+ // Fix/update nbemail on emailing record if it differs (may happen if user edit lines from database directly)
+ if (empty($asearchcriteriahasbeenset)) {
+ if ($nbtotalofrecords != $object->nbemail) {
+ dol_syslog("We found a difference in nb of record in target table and the property ->nbemail, we fix ->nbemail");
+ //print "nbemail=".$object->nbemail." nbtotalofrecords=".$nbtotalofrecords;
+ $resultrefresh = $object->refreshNbOfTargets();
+ if ($resultrefresh < 0) {
+ dol_print_error($db, $object->error, $object->errors);
+ }
+ }
+ }
}
//$nbtotalofrecords=$object->nbemail; // nbemail is a denormalized field storing nb of targets
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 2f2b16bd119..56670da17cd 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -118,36 +118,48 @@ class Mailing extends CommonObject
/**
* @var int id of user create
- * @deprecated
*/
public $user_creation;
/**
* @var int id of user create
+ * @deprecated
*/
public $user_creat;
/**
* @var int id of user validate
- * @deprecated
*/
public $user_validation;
/**
* @var int id of user validate
+ * @deprecated
*/
public $user_valid;
/**
* @var integer|string date_creation
+ * @deprecated
*/
public $date_creat;
+ /**
+ * @var integer|string date_creation
+ */
+ public $date_creation;
+
/**
* @var int date validate
+ * @deprecated
*/
public $date_valid;
+ /**
+ * @var int date validate
+ */
+ public $date_validation;
+
/**
* @var array extraparams
*/
@@ -314,10 +326,14 @@ class Mailing extends CommonObject
$this->email_errorsto = $obj->email_errorsto;
$this->user_creat = $obj->fk_user_creat;
+ $this->user_creation = $obj->fk_user_creat;
$this->user_valid = $obj->fk_user_valid;
+ $this->user_validation = $obj->fk_user_valid;
$this->date_creat = $this->db->jdate($obj->date_creat);
+ $this->date_creation = $this->db->jdate($obj->date_creat);
$this->date_valid = $this->db->jdate($obj->date_valid);
+ $this->date_validation = $this->db->jdate($obj->date_valid);
$this->date_envoi = $this->db->jdate($obj->date_envoi);
$this->extraparams = (array) json_decode($obj->extraparams, true);
@@ -510,6 +526,8 @@ class Mailing extends CommonObject
dol_syslog("Mailing::delete_targets", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
+ $this->refreshNbOfTargets();
+
return 1;
} else {
$this->error = $this->db->lasterror();
@@ -577,6 +595,41 @@ class Mailing extends CommonObject
return 0;
}
+ /**
+ * Refresh denormalized value ->nbemail into emailing record
+ * Note: There is also the method update_nb into modules_mailings that is used for this.
+ *
+ * @return int <0 if KO, >0 if OK
+ */
+ public function refreshNbOfTargets()
+ {
+ $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
+ $sql .= " WHERE fk_mailing = ".$this->id;
+
+ $resql = $this->db->query($sql);
+ if ($resql) {
+ $obj = $this->db->fetch_object($resql);
+ if ($obj) {
+ $nbforupdate = $obj->nb;
+
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'mailing SET nbemail = '.((int) $nbforupdate);
+ $sql .= ' WHERE rowid = '.$this->id;
+
+ $resqlupdate = $this->db->query($sql);
+ if (! $resqlupdate) {
+ $this->error = $this->db->lasterror();
+ return -1;
+ } else {
+ $this->nbemail = (int) $nbforupdate;
+ }
+ }
+ } else {
+ $this->error = $this->db->lasterror();
+ return -1;
+ }
+
+ return 1;
+ }
/**
* Return a link to the object card (with optionally the picto)
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 199a5caad8b..4bd39309701 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -33,8 +33,9 @@ $id = GETPOST('id', 'int');
$langs->load("mails");
// Security check
-if (!$user->rights->mailing->lire || $user->socid > 0)
-accessforbidden();
+if (!$user->rights->mailing->lire || $user->socid > 0) {
+ accessforbidden();
+}
@@ -48,8 +49,7 @@ $form = new Form($db);
$object = new Mailing($db);
-if ($object->fetch($id) >= 0)
-{
+if ($object->fetch($id) >= 0) {
$head = emailing_prepare_head($object);
print dol_get_fiche_head($head, 'info', $langs->trans("Mailing"), -1, 'email');
@@ -58,13 +58,14 @@ if ($object->fetch($id) >= 0)
$morehtmlright = '';
$nbtry = $nbok = 0;
- if ($object->statut == 2 || $object->statut == 3)
- {
+ if ($object->statut == 2 || $object->statut == 3) {
$nbtry = $object->countNbOfTargets('alreadysent');
$nbko = $object->countNbOfTargets('alreadysentko');
$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
- if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+ if ($nbko) {
+ $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+ }
$morehtmlright .= ') ';
}
@@ -73,10 +74,6 @@ if ($object->fetch($id) >= 0)
print '
';
//print '
';
- $object->user_creation = $object->user_creat;
- $object->date_creation = $object->date_creat;
- $object->user_validation = $object->user_valid;
- $object->date_validation = $object->date_valid;
dol_print_object_info($object, 0);
//print '
';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 12146179db0..f6a63ba9a48 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1660,7 +1660,7 @@ if ($action == 'create')
print '
'.$langs->trans('NotePublic').' ';
print '
';
$note_public = $object->getDefaultCreateValueFor('note_public', (is_object($objectsrc) ? $objectsrc->note_public : null));
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -1670,7 +1670,7 @@ if ($action == 'create')
print ' '.$langs->trans('NotePrivate').' ';
print '
';
$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc)) ? $objectsrc->note_private : null));
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' '.$langs->trans('NotePublic').' ';
print '';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '';
print ' ';
@@ -1747,7 +1747,7 @@ if ($action == 'create' && $usercancreate)
print ''.$langs->trans('NotePrivate').' ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '';
print ' ';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 4ededdeacaf..3cc0fa72ae6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3060,7 +3060,9 @@ class Commande extends CommonOrder
$pu = price2num($pu);
$pa_ht = price2num($pa_ht);
$pu_ht_devise = price2num($pu_ht_devise);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
@@ -3159,8 +3161,8 @@ class Commande extends CommonOrder
$this->line->tva_tx = $txtva;
$this->line->localtax1_tx = $txlocaltax1;
$this->line->localtax2_tx = $txlocaltax2;
- $this->line->localtax1_type = $localtaxes_type[0];
- $this->line->localtax2_type = $localtaxes_type[2];
+ $this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+ $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
$this->line->remise_percent = $remise_percent;
$this->line->subprice = $subprice;
$this->line->info_bits = $info_bits;
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index d57e2cf5591..63021eb3b07 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -155,14 +155,8 @@ $arrayfields = array(
'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 30e483fdfa9..af4fb6e571c 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -95,6 +95,9 @@ if ($action == 'add')
$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
+ $object->ics = trim(GETPOST("ics", 'alpha'));
+ $object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
+
$account_number = GETPOST('account_number', 'alphanohtml');
if (empty($account_number) || $account_number == '-1')
{
@@ -196,6 +199,9 @@ if ($action == 'update')
$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
+ $object->ics = trim(GETPOST("ics", 'alpha'));
+ $object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
+
$account_number = GETPOST('account_number', 'alpha');
if (empty($account_number) || $account_number == '-1')
{
@@ -730,6 +736,18 @@ if ($action == 'create')
}
print '';
+ if ($conf->prelevement->enabled){
+ print ''.$langs->trans("ICS").' ';
+ print ''.$object->ics.' ';
+ print ''.$langs->trans("ICSTransfer").' ';
+ print ''.$object->ics_transfer.' ';
+ print ''.$langs->trans("BankAccountDomiciliation").' ';
print nl2br($object->domiciliation);
print " '.$langs->trans($bickey).' ';
print ''.$langs->trans("ICS").' ';
+ print ''.$langs->trans("ICSTransfer").' ';
+ print ''.$langs->trans("BankAccountDomiciliation").' ';
print '
print ' ';
- $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// Private note
@@ -3545,7 +3545,7 @@ if ($action == 'create')
print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
print ' ';
print '';
- $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+ $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
// print '
print ' ';
@@ -4738,7 +4738,15 @@ if ($action == 'create')
print '';
print $paymentstatic->getNomUrl(1);
print ' ';
- print ''.dol_print_date($db->jdate($objp->dp), 'dayhour').' ';
+ print '';
+ $dateofpayment = $db->jdate($objp->dp);
+ $tmparray = dol_getdate($dateofpayment);
+ if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) { // We set hours to 0:00 or 12:00 because we don't know it
+ print dol_print_date($dateofpayment, 'day');
+ } else { // Hours was set to real date of payment (special case for POS for example)
+ print dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+ }
+ print ' ';
$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
print ''.$label.' '.$objp->num_payment.' ';
if (!empty($conf->banque->enabled))
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 9c0d191f0cf..29e78f90af8 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -853,7 +853,9 @@ class FactureRec extends CommonInvoice
$qty = price2num($qty);
$pu_ht = price2num($pu_ht);
$pu_ttc = price2num($pu_ttc);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
if (empty($txtva)) $txtva = 0;
@@ -1031,7 +1033,9 @@ class FactureRec extends CommonInvoice
$pu_ht = price2num($pu_ht);
$pu_ttc = price2num($pu_ttc);
$pu_ht_devise = price2num($pu_ht_devise);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
if (empty($txlocaltax1)) $txlocaltax1 = 0;
@@ -1057,6 +1061,7 @@ class FactureRec extends CommonInvoice
// Clean vat code
$vat_src_code = '';
+ $reg = array();
if (preg_match('/\((.*)\)/', $txtva, $reg))
{
$vat_src_code = $reg[1];
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ec55810e2da..24f5b748e52 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -3136,8 +3136,8 @@ class Facture extends CommonInvoice
$this->line->tva_tx = $txtva;
$this->line->localtax1_tx = ($total_localtax1 ? $localtaxes_type[1] : 0);
$this->line->localtax2_tx = ($total_localtax2 ? $localtaxes_type[3] : 0);
- $this->line->localtax1_type = isset($localtaxes_type[0]) ? $localtaxes_type[0] : '';
- $this->line->localtax2_type = isset($localtaxes_type[2]) ? $localtaxes_type[2] : '';
+ $this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+ $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
$this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
$this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
@@ -3283,7 +3283,9 @@ class Facture extends CommonInvoice
$pu = price2num($pu);
$pu_ht_devise = price2num($pu_ht_devise);
$pa_ht = price2num($pa_ht);
- $txtva = price2num($txtva);
+ if (!preg_match('/\((.*)\)/', $txtva)) {
+ $txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+ }
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
@@ -3375,8 +3377,8 @@ class Facture extends CommonInvoice
$this->line->tva_tx = $txtva;
$this->line->localtax1_tx = $txlocaltax1;
$this->line->localtax2_tx = $txlocaltax2;
- $this->line->localtax1_type = $localtaxes_type[0];
- $this->line->localtax2_type = $localtaxes_type[2];
+ $this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+ $this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
$this->line->remise_percent = $remise_percent;
$this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index c0abc5a6028..6beb5caa1e2 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -135,14 +135,8 @@ $arrayfields = array(
'f.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index c61bfdf6819..a1bde7e4f3d 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1584,6 +1584,8 @@ if ($resql)
{
print ''.price($marginInfo['total_margin']).' ';
if (!$i) $totalarray['nbfield']++;
+ if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+ $totalarray['val']['total_margin'] += $marginInfo['total_margin'];
}
// Total margin rate
if (!empty($arrayfields['total_margin_rate']['checked']))
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 7e852846d5c..d50813cbea4 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -213,7 +213,7 @@ if ($object->id > 0)
$head = facture_prepare_head($object);
}
- print dol_get_fiche_head($head, 'standingorders', $title, -1, 'bill');
+ print dol_get_fiche_head($head, 'standingorders', $title, -1, ($type == 'bank-transfer' ? 'supplier_invoice' : 'bill'));
// Invoice content
if ($type == 'bank-transfer') {
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 863e841f716..6b7f1612836 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -294,7 +294,7 @@ class Paiement extends CommonObject
$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement (entity, ref, ref_ext, datec, datep, amount, multicurrency_amount, fk_paiement, num_paiement, note, ext_payment_id, ext_payment_site, fk_user_creat, pos_change)";
$sql .= " VALUES (".$conf->entity.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->idate($now)."', '".$this->db->idate($this->datepaye)."', ".$total.", ".$mtotal.", ".$this->paiementid.", ";
- $sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((int) $this->pos_change).")";
+ $sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((float) $this->pos_change).")";
$resql = $this->db->query($sql);
if ($resql)
@@ -1171,9 +1171,19 @@ class Paiement extends CommonObject
if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
$result = '';
+
$label = img_picto('', $this->picto).' '.$langs->trans("Payment").' '.$langs->trans("Ref").': '.$this->ref;
- if ($this->datepaye ? $this->datepaye : $this->date) $label .= ''.$langs->trans("Date").': '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+ $dateofpayment = ($this->datepaye ? $this->datepaye : $this->date);
+ if ($dateofpayment) {
+ $label .= ''.$langs->trans("Date").': ';
+ $tmparray = dol_getdate($dateofpayment);
+ if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) { // We set hours to 0:00 or 12:00 because we don't know it
+ $label .= dol_print_date($dateofpayment, 'day');
+ } else { // Hours was set to real date of payment (special case for POS for example)
+ $label .= dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+ }
+ }
if ($mode == 'withlistofinvoices')
{
$arraybill = $this->getBillsArray();
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 78425398017..c6788d0edc6 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -55,7 +55,7 @@ $result = restrictedArea($user, 'paymentbybanktransfer', '', '');
llxHeader('', $langs->trans("SuppliersStandingOrdersArea"));
-if (prelevement_check_config() < 0)
+if (prelevement_check_config('bank-transfer') < 0)
{
$langs->load("errors");
setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index fb2f114b579..89687997a59 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -5,6 +5,7 @@
* Copyright (C) 2010-2014 Laurent Destailleur
* Copyright (C) 2014-2016 Ferran Marcet
* Copyright (C) 2018 Nicolas ZABOURI
+ * Copyright (C) 2019 JC Prieto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1158,7 +1159,7 @@ class BonPrelevement extends CommonObject
$this->emetteur_iban = $account->iban;
$this->emetteur_bic = $account->bic;
- $this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+ $this->emetteur_ics = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics);
$this->raison_sociale = $account->proprio;
}
@@ -1589,7 +1590,7 @@ class BonPrelevement extends CommonObject
fputs($this->file, ' '.$CrLf);
fputs($this->file, ' '.$CrLf);
fputs($this->file, ' '.$CrLf);
- fputs($this->file, ' '.$conf->global->PRELEVEMENT_ICS.' '.$CrLf);
+ fputs($this->file, ' '.$this->emetteur_ics.' '.$CrLf);
fputs($this->file, ' '.$CrLf);
fputs($this->file, ' '.$CrLf);
fputs($this->file, ' '.$CrLf);
@@ -2130,7 +2131,7 @@ class BonPrelevement extends CommonObject
$this->emetteur_iban = $account->iban;
$this->emetteur_bic = $account->bic;
- $this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
+ $this->emetteur_ics = ($type == 'bank-transfer' ? $account->ics_transfer : $account->ics); // Ex: PRELEVEMENT_ICS = "FR78ZZZ123456";
$this->raison_sociale = $account->proprio;
}
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index e93b2a7472d..26b91a1e100 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -49,6 +49,7 @@ $type = GETPOST('type', 'aZ09');
$action = GETPOST('action', 'aZ09');
$mode = GETPOST('mode', 'alpha') ?GETPOST('mode', 'alpha') : 'real';
$format = GETPOST('format', 'aZ09');
+$id_bankaccount = GETPOST('id_bankaccount', 'int');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
@@ -77,11 +78,27 @@ if (empty($reshook))
}
if ($action == 'create')
{
+ $default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
+
+ if ($id_bankaccount != $conf->global->{$default_account}){
+ $res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity); //Set as default
+ }
+
+ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+ $bank = new Account($db);
+ $bank->fetch($conf->global->{$default_account});
+ if (empty($bank->ics) || empty($bank->ics_transfer)){
+ setEventMessages($langs->trans("ErrorICSmissing", $bank->getNomUrl(1)), null, 'errors');
+ header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
+ exit;
+ }
+
+
$delayindays = 0;
if ($type != 'bank-transfer') {
- $conf->global->PRELEVEMENT_ADDDAYS;
+ $delayindays = $conf->global->PRELEVEMENT_ADDDAYS;
} else {
- $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
+ $delayindays = $conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS;
}
$bprev = new BonPrelevement($db);
$executiondate = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), (GETPOST('reday', 'int') + $delayindays), GETPOST('reyear', 'int'));
@@ -128,12 +145,13 @@ $bprev = new BonPrelevement($db);
llxHeader('', $langs->trans("NewStandingOrder"));
-if (prelevement_check_config() < 0)
+if (prelevement_check_config($type) < 0)
{
$langs->load("errors");
setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
}
+
/*$h=0;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/create.php';
$head[$h][1] = $langs->trans("NewStandingOrder");
@@ -188,10 +206,15 @@ print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price($total_ht).' ';
print ''.price($total_ttc).' ';
print ' ';
+ /*
+ * Donations
+ */
+
+ if (!empty($conf->don->enabled))
+ {
+ print ''.$langs->trans("Donations").' ';
+
+ print "".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname." \n";
+
+ if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).' ';
+ print ''.price($obj->amount).' ';
+ print ' ';
+ print ''.$langs->trans("None").' ';
+ if ($modecompta == 'CREANCES-DETTES')
+ print ''.price($subtotal_ht).' ';
+ print ''.price($subtotal_ttc).' ';
+ print ' ';
+ }
/*
* Suppliers invoices
@@ -515,7 +598,7 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
@@ -530,7 +616,6 @@ if ($modecompta == 'BOOKKEEPING')
print ' ';
-
/*
* Charges sociales non deductibles
*/
@@ -592,12 +677,15 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
@@ -667,36 +755,21 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
print ''.price(-$subtotal_ttc).' ';
print ' ';
- if ($mysoc->tva_assuj == 'franchise') // Non assujetti
- {
- // Total
- print '';
- print ' ';
- print ' ';
-
- print ''.$langs->trans("Profit").' ';
- if ($modecompta == 'CREANCES-DETTES')
- print ''.price($total_ht).' ';
- print ''.price($total_ttc).' ';
- print '';
- print ' ';
- print ' ';
- }
-
/*
* Salaries
@@ -759,12 +832,15 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
if ($modecompta == 'CREANCES-DETTES')
print ''.price(-$subtotal_ht).' ';
@@ -841,98 +917,26 @@ if ($modecompta == 'BOOKKEEPING')
}
} else {
print ' ';
- print ''.$langs->trans("None").' ';
+ print ''.$langs->trans("None").' ';
if ($modecompta == 'CREANCES-DETTES') print ''.price(-$subtotal_ht).' ';
print ''.price(-$subtotal_ttc).' ';
print ' ';
}
- /*
- * Donations
- */
-
- if (!empty($conf->don->enabled))
- {
- print ''.$langs->trans("Donations").' ';
-
- print "".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname." \n";
-
- if ($modecompta == 'CREANCES-DETTES') print ''.price($obj->amount).' ';
- print ''.price($obj->amount).' ';
- print ' ';
- print ''.$langs->trans("None").' ';
- print '';
- if ($modecompta == 'CREANCES-DETTES')
- print ''.price($subtotal_ht).' ';
- print ''.price($subtotal_ttc).' ';
- print ' ';
- }
/*
* Various Payments
*/
+ //$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
{
@@ -953,12 +957,14 @@ if ($modecompta == 'BOOKKEEPING')
$result = $db->query($sql);
if ($result)
{
- // Debit
+ // Debit (payment of suppliers for example)
$obj = $db->fetch_object($result);
if (isset($obj->amount))
{
$subtotal_ht += -$obj->amount;
$subtotal_ttc += -$obj->amount;
+ $total_ht_outcome += $obj->amount;
+ $total_ttc_outcome += $obj->amount;
}
print ' ';
print "".$langs->trans("Debit")." \n";
@@ -966,12 +972,14 @@ if ($modecompta == 'BOOKKEEPING')
print ''.price(-$obj->amount)." \n";
print " ';
print "".$langs->trans("Credit")." \n";
@@ -1030,6 +1038,8 @@ if ($modecompta == 'BOOKKEEPING')
}
$total_ht += $subtotal_ht;
$total_ttc += $subtotal_ttc;
+ $total_ht_income += $subtotal_ht;
+ $total_ttc_income += $subtotal_ttc;
print '';
if ($modecompta == 'CREANCES-DETTES')
print ''.price($subtotal_ht).' ';
@@ -1050,7 +1060,7 @@ if ($modecompta == 'BOOKKEEPING')
{
if ($modecompta == 'CREANCES-DETTES')
{
- // TVA a payer
+ // VAT to pay
$amount = 0;
$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
@@ -1091,13 +1101,15 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+ $total_ht_outcome -= 0;
+ $total_ttc_outcome -= $amount;
print ' ';
print "".$langs->trans("VATToPay")." \n";
print ' '."\n";
print ''.price($amount)." \n";
print " ';
print ''.$langs->trans("VATToCollect")." \n";
print ' '."\n";
@@ -1182,10 +1197,12 @@ if ($modecompta == 'BOOKKEEPING')
} else {
dol_print_error($db);
}
+ $total_ht_outcome -= 0;
+ $total_ttc_outcome -= $amount;
print ' ';
print "".$langs->trans("VATPaid")." \n";
if ($modecompta == 'CREANCES-DETTES')
- print ''.price($amount)." \n";
+ print ''.price($amount)." \n";
print " ';
print "".$langs->trans("VATCollected")." \n";
if ($modecompta == 'CREANCES-DETTES')
- print ''.price($amount)." \n";
+ print ''.price($amount)." \n";
print "';
if ($modecompta == 'CREANCES-DETTES')
@@ -1250,25 +1269,31 @@ $object = array(&$total_ht, &$total_ttc);
$parameters["mode"] = $modecompta;
$parameters["date_start"] = $date_start;
$parameters["date_end"] = $date_end;
-$parameters["bc"] = $bc;
// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('externalbalance'));
$reshook = $hookmanager->executeHooks('addBalanceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
print $hookmanager->resPrint;
-if ($mysoc->tva_assuj != 'franchise') // Assujetti
-{
- // Total
- print ' ';
- print ' ';
- print ' ';
+// Total
+print '';
+print ' ';
+print ' ';
- print ''.$langs->trans("Profit").' ';
- if ($modecompta == 'CREANCES-DETTES')
- print ''.price(price2num($total_ht, 'MT')).' ';
- print ''.price(price2num($total_ttc, 'MT')).' ';
- print ''.$langs->trans("Outcome").' ';
+if ($modecompta == 'CREANCES-DETTES')
+ print ''.price(price2num(-$total_ht_outcome, 'MT')).' ';
+print ''.price(price2num(-$total_ttc_outcome, 'MT')).' ';
+print ''.$langs->trans("Income").' ';
+if ($modecompta == 'CREANCES-DETTES')
+ print ''.price(price2num($total_ht_income, 'MT')).' ';
+print ''.price(price2num($total_ttc_income, 'MT')).' ';
+print ''.$langs->trans("Profit").' ';
+if ($modecompta == 'CREANCES-DETTES')
+ print ''.price(price2num($total_ht, 'MT')).' ';
+print ''.price(price2num($total_ttc, 'MT')).' ';
+print '
';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 752bdc4d642..23297438e19 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1129,13 +1129,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// Note Public
print '
';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 367a2e7cd62..8fe4943d267 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1579,38 +1579,8 @@ class Contact extends CommonObject
*/
public function setCategories($categories)
{
- // Handle single category
- if (!is_array($categories)) {
- $categories = array($categories);
- }
-
- // Get current categories
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
- $c = new Categorie($this->db);
- $existing = $c->containing($this->id, Categorie::TYPE_CONTACT, 'id');
-
- // Diff
- if (is_array($existing)) {
- $to_del = array_diff($existing, $categories);
- $to_add = array_diff($categories, $existing);
- } else {
- $to_del = array(); // Nothing to delete
- $to_add = $categories;
- }
-
- // Process
- foreach ($to_del as $del) {
- if ($c->fetch($del) > 0) {
- $c->del_type($this, Categorie::TYPE_CONTACT);
- }
- }
- foreach ($to_add as $add) {
- if ($c->fetch($add) > 0) {
- $c->add_type($this, Categorie::TYPE_CONTACT);
- }
- }
-
- return;
+ return parent::setCategoriesCommon($categories, Categorie::TYPE_CONTACT);
}
/**
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 00c74544d17..8d6b11e19f0 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -267,7 +267,7 @@ if (empty($reshook))
$search_categ_thirdparty = '';
$search_categ_supplier = '';
$search_import_key = '';
- $toselect = '';
+ $toselect = array();
$search_array_options = array();
$search_roles = array();
}
@@ -277,6 +277,7 @@ if (empty($reshook))
$objectlabel = 'Contact';
$permissiontoread = $user->rights->societe->lire;
$permissiontodelete = $user->rights->societe->supprimer;
+ $permissiontoadd = $user->rights->societe->creer;
$uploaddir = $conf->societe->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
@@ -525,7 +526,8 @@ $arrayofmassactions = array(
);
//if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
if ($user->rights->societe->supprimer) $arrayofmassactions['predelete'] = '
'.$langs->trans("Delete");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->societe->creer) $arrayofmassactions['preaffecttag'] = '
'.$langs->trans("AffectTag");
+if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
$newcardbutton = dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $user->rights->societe->contact->creer);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 2e692dc25c4..3906d376243 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -89,6 +89,7 @@ $extralabelslines = $extrafields->fetch_name_optionals_label($object->table_elem
$permissionnote = $user->rights->contrat->creer; // Used by the include of actions_setnotes.inc.php
$permissiondellink = $user->rights->contrat->creer; // Used by the include of actions_dellink.inc.php
+$error = 0;
/*
@@ -383,9 +384,9 @@ if (empty($reshook))
{
// Set if we used free entry or predefined product
$predef = '';
- $product_desc = (GETPOST('dp_desc') ?GETPOST('dp_desc') : '');
- $price_ht = price2num(GETPOST('price_ht'));
- $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
+ $product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+ $price_ht = price2num(GETPOST('price_ht'), 'MU');
+ $price_ht_devise = price2num(GETPOST('multicurrency_price_ht', 'CR'));
if (GETPOST('prod_entry_mode', 'alpha') == 'free')
{
$idprod = 0;
@@ -395,7 +396,7 @@ if (empty($reshook))
$tva_tx = '';
}
- $qty = price2num(GETPOST('qty'.$predef));
+ $qty = price2num(GETPOST('qty'.$predef), 'alpha');
$remise_percent = ((GETPOST('remise_percent'.$predef) != '') ? GETPOST('remise_percent'.$predef) : 0);
if ($qty == '')
@@ -1174,14 +1175,14 @@ if ($action == 'create')
}
print '
';
}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 9bdb1d5a846..36edee80669 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1465,7 +1465,6 @@ class Contrat extends CommonObject
$vat_src_code = $reg[1];
$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
}
-
$txtva = price2num($txtva);
$txlocaltax1 = price2num($txlocaltax1);
$txlocaltax2 = price2num($txlocaltax2);
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index ca8ccb9bd7d..72a8ec2974d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -131,14 +131,8 @@ $arrayfields = array(
'status'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -620,14 +614,14 @@ while ($i < min($num, $limit))
$socstatic->logo = $obj->logo;
$socstatic->country_id = $obj->country_id;
$socstatic->country_code = '';
- $socstatic->country_label = '';*/
+ $socstatic->country = '';*/
if ($obj->country_id > 0) {
if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
$tmparray = getCountry($obj->country_id, 'all');
$cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
}
$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
- $socstatic->country_label = $cacheCountryIDCode[$obj->country_id]['label'];
+ $socstatic->country = $cacheCountryIDCode[$obj->country_id]['label'];
}
@@ -701,7 +695,7 @@ while ($i < min($num, $limit))
if (!empty($arrayfields['country.code_iso']['checked']))
{
print '
';
if (!$i) $totalarray['nbfield']++;
}
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 67b605d657f..4de651a24f9 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -130,14 +130,8 @@ $arrayfields = array(
'cd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500)
);
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
- {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key]))
- $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 356eb36a04b..81cc4d81bd4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1291,6 +1291,64 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
}
}
+if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd) {
+ $db->begin();
+
+ $affecttag_type=GETPOST('affecttag_type', 'alpha');
+ if (!empty($affecttag_type)) {
+ $affecttag_type_array=explode(',', $affecttag_type);
+ } else {
+ setEventMessage('CategTypeNotFound', 'errors');
+ }
+ if (!empty($affecttag_type_array)) {
+ //check if tag type submited exists into Tag Map categorie class
+ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+ $categ = new Categorie($db);
+ $to_affecttag_type_array=array();
+ $categ_type_array=$categ->getMapList();
+ foreach ($categ_type_array as $categdef) {
+ if (in_array($categdef['code'], $affecttag_type_array)) {
+ $to_affecttag_type_array[] = $categdef['code'];
+ }
+ }
+
+ //For each valid categ type set common categ
+ $nbok = 0;
+ if (!empty($to_affecttag_type_array)) {
+ foreach ($to_affecttag_type_array as $categ_type) {
+ $contcats = GETPOST('contcats_' . $categ_type, 'array');
+ //var_dump($toselect);exit;
+ foreach ($toselect as $toselectid) {
+ $result = $object->fetch($toselectid);
+ //var_dump($contcats);exit;
+ if ($result > 0) {
+ $result = $object->setCategoriesCommon($contcats, $categ_type, false);
+ if ($result > 0) {
+ $nbok++;
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ }
+ } else {
+ setEventMessages($object->error, $object->errors, 'errors');
+ $error++;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (!$error)
+ {
+ if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null);
+ else setEventMessages($langs->trans("RecordsModified", $nbok), null);
+ $db->commit();
+ $toselect=array();
+ } else {
+ $db->rollback();
+ }
+}
+
$parameters['toselect'] = $toselect;
$parameters['uploaddir'] = $uploaddir;
$parameters['massaction'] = $massaction;
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 0be919de0dd..929d35d9730 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -33,8 +33,7 @@
/*
* Add file in email form
*/
-if (GETPOST('addfile', 'alpha'))
-{
+if (GETPOST('addfile', 'alpha')) {
$trackid = GETPOST('trackid', 'aZ09');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -50,8 +49,7 @@ if (GETPOST('addfile', 'alpha'))
/*
* Remove file in email form
*/
-if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
-{
+if (!empty($_POST['removedfile']) && empty($_POST['removAll'])) {
$trackid = GETPOST('trackid', 'aZ09');
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -69,24 +67,28 @@ if (!empty($_POST['removedfile']) && empty($_POST['removAll']))
/*
* Remove all files in email form
*/
-if (GETPOST('removAll', 'alpha'))
-{
+if (GETPOST('removAll', 'alpha')) {
$trackid = GETPOST('trackid', 'aZ09');
$listofpaths = array();
$listofnames = array();
$listofmimes = array();
$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
- if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
- if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
- if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+ if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+ $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+ }
+ if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+ $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+ }
+ if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+ $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+ }
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($db);
$formmail->trackid = $trackid;
- foreach ($listofpaths as $key => $value)
- {
+ foreach ($listofpaths as $key => $value) {
$pathtodelete = $value;
$filetodelete = $listofnames[$key];
$result = dol_delete_file($pathtodelete, 1); // Delete uploded Files
@@ -101,50 +103,56 @@ if (GETPOST('removAll', 'alpha'))
/*
* Send mail
*/
-if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected'])
-{
- if (empty($trackid)) $trackid = GETPOST('trackid', 'aZ09');
+if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected']) {
+ if (empty($trackid)) {
+ $trackid = GETPOST('trackid', 'aZ09');
+ }
$subject = ''; $actionmsg = ''; $actionmsg2 = '';
$langs->load('mails');
- if (is_object($object))
- {
+ if (is_object($object)) {
$result = $object->fetch($id);
$sendtosocid = 0; // Id of related thirdparty
- if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('member', 'user', 'expensereport', 'societe', 'contact')))
- {
+ if (method_exists($object, "fetch_thirdparty") && !in_array($object->element, array('member', 'user', 'expensereport', 'societe', 'contact'))) {
$resultthirdparty = $object->fetch_thirdparty();
$thirdparty = $object->thirdparty;
- if (is_object($thirdparty)) $sendtosocid = $thirdparty->id;
- } elseif ($object->element == 'member' || $object->element == 'user')
- {
+ if (is_object($thirdparty)) {
+ $sendtosocid = $thirdparty->id;
+ }
+ } elseif ($object->element == 'member' || $object->element == 'user') {
$thirdparty = $object;
- if ($object->socid > 0) $sendtosocid = $object->socid;
- } elseif ($object->element == 'expensereport')
- {
+ if ($object->socid > 0) {
+ $sendtosocid = $object->socid;
+ }
+ } elseif ($object->element == 'expensereport') {
$tmpuser = new User($db);
$tmpuser->fetch($object->fk_user_author);
$thirdparty = $tmpuser;
- if ($object->socid > 0) $sendtosocid = $object->socid;
- } elseif ($object->element == 'societe')
- {
+ if ($object->socid > 0) {
+ $sendtosocid = $object->socid;
+ }
+ } elseif ($object->element == 'societe') {
$thirdparty = $object;
- if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
- } elseif ($object->element == 'contact')
- {
+ if (is_object($thirdparty) && $thirdparty->id > 0) {
+ $sendtosocid = $thirdparty->id;
+ }
+ } elseif ($object->element == 'contact') {
$contact = $object;
if ($contact->id > 0) {
$contact->fetch_thirdparty();
$thirdparty = $contact->thirdparty;
- if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
+ if (is_object($thirdparty) && $thirdparty->id > 0) {
+ $sendtosocid = $thirdparty->id;
+ }
}
- } else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+ } else {
+ dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+ }
- if (is_object($hookmanager))
- {
+ if (is_object($hookmanager)) {
$parameters = array();
$reshook = $hookmanager->executeHooks('initSendToSocid', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
}
@@ -152,8 +160,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$thirdparty = $mysoc;
}
- if ($result > 0)
- {
+ if ($result > 0) {
$sendto = '';
$sendtocc = '';
$sendtobcc = '';
@@ -163,48 +170,40 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
// Define $sendto
$receiver = $_POST['receiver'];
- if (!is_array($receiver))
- {
- if ($receiver == '-1') $receiver = array();
- else $receiver = array($receiver);
+ if (!is_array($receiver)) {
+ if ($receiver == '-1') {
+ $receiver = array();
+ } else {
+ $receiver = array($receiver);
+ }
}
$tmparray = array();
- if (trim($_POST['sendto']))
- {
+ if (trim($_POST['sendto'])) {
// Recipients are provided into free text
$tmparray[] = trim($_POST['sendto']);
}
- if (count($receiver) > 0)
- {
+ if (count($receiver) > 0) {
// Recipient was provided from combo list
- foreach ($receiver as $key=>$val)
- {
- if ($val == 'thirdparty') // Key selected means current third party ('thirdparty' may be used for current member or current user too)
- {
+ foreach ($receiver as $key => $val) {
+ if ($val == 'thirdparty') { // Key selected means current third party ('thirdparty' may be used for current member or current user too)
$tmparray[] = dol_string_nospecial($thirdparty->getFullName($langs), ' ', array(",")).' <'.$thirdparty->email.'>';
- }
- elseif ($val == 'contact') // Key selected means current contact
- {
+ } elseif ($val == 'contact') { // Key selected means current contact
$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
$sendtoid[] = $contact->id;
- } elseif ($val) // $val is the Id of a contact
- {
+ } elseif ($val) { // $val is the Id of a contact
$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
$sendtoid[] = ((int) $val);
}
}
}
- if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT))
- {
+ if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
$receiveruser = $_POST['receiveruser'];
- if (is_array($receiveruser) && count($receiveruser) > 0)
- {
+ if (is_array($receiveruser) && count($receiveruser) > 0) {
$fuserdest = new User($db);
- foreach ($receiveruser as $key=>$val)
- {
+ foreach ($receiveruser as $key => $val) {
$tmparray[] = $fuserdest->user_get_property($val, 'email');
$sendtouserid[] = $val;
}
@@ -215,32 +214,27 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
// Define $sendtocc
$receivercc = $_POST['receivercc'];
- if (!is_array($receivercc))
- {
- if ($receivercc == '-1') $receivercc = array();
- else $receivercc = array($receivercc);
+ if (!is_array($receivercc)) {
+ if ($receivercc == '-1') {
+ $receivercc = array();
+ } else {
+ $receivercc = array($receivercc);
+ }
}
$tmparray = array();
- if (trim($_POST['sendtocc']))
- {
+ if (trim($_POST['sendtocc'])) {
$tmparray[] = trim($_POST['sendtocc']);
}
- if (count($receivercc) > 0)
- {
- foreach ($receivercc as $key=>$val)
- {
- // Recipient was provided from combo list
- if ($val == 'thirdparty') // Key selected means currentthird party (may be usd for current member or current user too)
- {
+ if (count($receivercc) > 0) {
+ foreach ($receivercc as $key => $val) {
+ if ($val == 'thirdparty') { // Key selected means currentthird party (may be usd for current member or current user too)
+ // Recipient was provided from combo list
$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
- }
- // Recipient was provided from combo list
- elseif ($val == 'contact') // Key selected means current contact
- {
+ } elseif ($val == 'contact') { // Key selected means current contact
+ // Recipient was provided from combo list
$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
//$sendtoid[] = $contact->id; TODO Add also id of contact in CC ?
- } elseif ($val) // $val is the Id of a contact
- {
+ } elseif ($val) { // $val is the Id of a contact
$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
//$sendtoid[] = ((int) $val); TODO Add also id of contact in CC ?
}
@@ -249,11 +243,9 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
$receiverccuser = $_POST['receiverccuser'];
- if (is_array($receiverccuser) && count($receiverccuser) > 0)
- {
+ if (is_array($receiverccuser) && count($receiverccuser) > 0) {
$fuserdest = new User($db);
- foreach ($receiverccuser as $key=>$val)
- {
+ foreach ($receiverccuser as $key => $val) {
$tmparray[] = $fuserdest->user_get_property($val, 'email');
$sendtoccuserid[] = $val;
}
@@ -261,8 +253,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
}
$sendtocc = implode(',', $tmparray);
- if (dol_strlen($sendto))
- {
+ if (dol_strlen($sendto)) {
// Define $urlwithroot
$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
@@ -291,8 +282,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$sql .= ' WHERE rowid = '.(int) $reg[1];
$resql = $db->query($sql);
$obj = $db->fetch_object($resql);
- if ($obj)
- {
+ if ($obj) {
$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
}
} else {
@@ -312,21 +302,20 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$sendtobcc = GETPOST('sendtoccc');
// Autocomplete the $sendtobcc
// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
- if (!empty($autocopy))
- {
+ if (!empty($autocopy)) {
$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc ? ", " : "").$conf->global->$autocopy));
}
$deliveryreceipt = $_POST['deliveryreceipt'];
- if ($action == 'send' || $action == 'relance')
- {
+ if ($action == 'send' || $action == 'relance') {
$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('at').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
- if ($message)
- {
+ if ($message) {
$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
- if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
+ if ($sendtocc) {
+ $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
+ }
$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
$actionmsg = dol_concatdesc($actionmsg, $message);
@@ -343,50 +332,6 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
$filename = $attachedfiles['names'];
$mimetype = $attachedfiles['mimes'];
- // Feature to push mail sent into Sent folder
- /* This code must be now included into the hook mail, method sendMailAfter
- if (! empty($conf->dolimail->enabled))
- {
- $mailfromid = explode("#", $_POST['frommail'],3); // $_POST['frommail'] = 'aaa#Sent#