'.$langs->trans("VATToUseForSubscriptions").' ';
if (!empty($conf->banque->enabled)) {
print '';
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 72f75cdf4c8..8bf7f7af6a6 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -1,7 +1,7 @@
* Copyright (C) 2002-2003 Jean-Louis Bergamo
- * Copyright (C) 2004-2016 Laurent Destailleur
+ * Copyright (C) 2004-2022 Laurent Destailleur
* Copyright (C) 2013-2015 Raphaël Doursenaud
* Copyright (C) 2014-2016 Juanjo Menent
* Copyright (C) 2018 Alexandre Spangaro
@@ -63,6 +63,7 @@ $search_email = GETPOST("search_email", 'alpha');
$search_categ = GETPOST("search_categ", 'int');
$search_filter = GETPOST("search_filter", 'alpha');
$search_status = GETPOST("search_status", 'intcomma');
+$search_import_key = trim(GETPOST("search_import_key", "alpha"));
$catid = GETPOST("catid", 'int');
$optioncss = GETPOST('optioncss', 'alpha');
$socid = GETPOST('socid', 'int');
@@ -156,7 +157,8 @@ $arrayfields = array(
'd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
'd.birth'=>array('label'=>$langs->trans("Birthday"), 'checked'=>0, 'position'=>500),
'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
- 'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
+ 'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+ 'd.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
);
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -213,6 +215,7 @@ if (empty($reshook)) {
$search_categ = "";
$search_filter = "";
$search_status = "";
+ $search_import_key = '';
$catid = "";
$sall = "";
$toselect = array();
@@ -318,7 +321,7 @@ $sql .= " d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe
$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.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,";
-$sql .= " d.note_private, d.note_public,";
+$sql .= " d.note_private, d.note_public, d.import_key,";
$sql .= " s.nom,";
$sql .= " ".$db->ifsql("d.societe IS NULL", "s.nom", "d.societe")." as companyname,";
$sql .= " t.libelle as type, t.subscription,";
@@ -427,6 +430,9 @@ if ($search_phone_mobile) {
if ($search_country) {
$sql .= " AND d.country IN (".$db->sanitize($search_country).')';
}
+if ($search_import_key) {
+ $sql .= natural_search("d.import_key", $search_import_key);
+}
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -436,8 +442,6 @@ $parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
$sql .= $hookmanager->resPrint;
-$sql .= $db->order($sortfield, $sortorder);
-
// Count total nb of records with no order and no limits
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -447,15 +451,20 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
} else {
dol_print_error($db);
}
+
if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
$page = 0;
$offset = 0;
}
+ $db->free($resql);
+}
+
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+ $sql .= $db->plimit($limit + 1, $offset);
}
-// Add limit
-$sql .= $db->plimit($limit + 1, $offset);
-dol_syslog("get list", LOG_DEBUG);
$resql = $db->query($sql);
if (!$resql) {
dol_print_error($db);
@@ -464,6 +473,7 @@ if (!$resql) {
$num = $db->num_rows($resql);
+
$arrayofselected = is_array($toselect) ? $toselect : array();
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
@@ -473,7 +483,8 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
exit;
}
-llxHeader('', $title, 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
+$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
+llxHeader('', $title, $help_url);
if (GETPOSTISSET("search_status")) {
if ($search_status == '-1,1') { // TODO : check this test as -1 == Adherent::STATUS_DRAFT and -2 == Adherent::STATUS_EXLCUDED
@@ -577,6 +588,9 @@ if ($search_filter && $search_filter != '-1') {
if ($search_status != "" && $search_status != -3) {
$param .= "&search_status=".urlencode($search_status);
}
+if ($search_import_key != '') {
+ $param .= '&search_import_key='.urlencode($search_import_key);
+}
if ($search_type > 0) {
$param .= "&search_type=".urlencode($search_type);
}
@@ -603,7 +617,7 @@ if ($user->rights->societe->creer) {
if ($user->rights->adherent->creer && $user->rights->user->user->creer) {
$arrayofmassactions['createexternaluser'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("CreateExternalUser");
}
-if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
$arrayofmassactions = array();
}
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -669,7 +683,6 @@ if ($massactionbutton) {
print '';
print '
'."\n";
-
// Line for filters fields
print '';
@@ -807,15 +820,24 @@ if (!empty($arrayfields['d.statut']['checked'])) {
print $form->selectarray('search_status', $liststatus, $search_status, -3);
print '';
}
-// Action column
-print '';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print ' ';
-
+if (!empty($arrayfields['d.import_key']['checked'])) {
+ print '';
+ print ' ';
+}
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ // Action column
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' ';
+}
print " \n";
print '';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+}
if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
}
@@ -895,7 +917,12 @@ if (!empty($arrayfields['d.tms']['checked'])) {
if (!empty($arrayfields['d.statut']['checked'])) {
print_liste_field_titre($arrayfields['d.statut']['label'], $_SERVER["PHP_SELF"], "d.statut", "", $param, 'class="right"', $sortfield, $sortorder);
}
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (!empty($arrayfields['d.import_key']['checked'])) {
+ print_liste_field_titre($arrayfields['d.import_key']['label'], $_SERVER["PHP_SELF"], "d.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+}
print " \n";
$i = 0;
@@ -936,7 +963,7 @@ while ($i < min($num, $limit)) {
print '';
if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
- print ''.$obj->rowid.' ';
+ print ''.$obj->rowid.' ';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -1172,21 +1199,31 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
- // Action column
- print '';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ if (!empty($arrayfields['d.import_key']['checked'])) {
+ print ' ';
+ print dol_escape_htmltag($obj->import_key);
+ print " \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
}
- print '';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
+ }
if (!$i) {
$totalarray['nbfield']++;
}
- print " \n";
+ print ''."\n";
$i++;
}
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index 7dccaa90eda..1cfbb80f65b 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -1067,12 +1067,12 @@ if ($rowid > 0) {
// Bank account
print ''.$langs->trans("FinancialAccount").' ';
print img_picto('', 'bank_account');
- $form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2);
+ $form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2, '', 0, 'minwidth200');
print " '.$langs->trans("PaymentMode").' ';
- $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2);
+ $form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200');
print " '."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
@@ -483,13 +473,13 @@ print '';
// Active
if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
print ''."\n";
- print '';
+ print ' ';
print img_picto($langs->trans("Enabled"), 'switch_on');
print ' ';
print ' ';
} else {
print ''."\n";
- print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
+ print ''.img_picto($langs->trans("Disabled"), 'switch_off').' ';
print " ";
}
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 00eebf78f10..796e64223c4 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1490,11 +1490,13 @@ if ($id > 0) {
}
if ($valuetoshow != '') {
+ $tooltiphelp = (isset($tabcomplete[$tabname[$id]]['help'][$value]) ? $tabcomplete[$tabname[$id]]['help'][$value] : '');
+
$tdsoffields .= '';
- if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
- $tdsoffields .= ''.$valuetoshow.' '.img_help(1, $valuetoshow).' ';
- } elseif (!empty($tabhelp[$id][$value])) {
- $tdsoffields .= $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+ if ($tooltiphelp && preg_match('/^http(s*):/i', $tooltiphelp)) {
+ $tdsoffields .= ''.$valuetoshow.' '.img_help(1, $valuetoshow).' ';
+ } elseif ($tooltiphelp) {
+ $tdsoffields .= $form->textwithpicto($valuetoshow, $tooltiphelp);
} else {
$tdsoffields .= $valuetoshow;
}
@@ -1643,8 +1645,8 @@ if ($id > 0) {
continue;
}
- if (in_array($value, array('label', 'libelle', 'libelle_facture')) && empty($tabhelp[$id][$value])) {
- $tabhelp[$id][$value] = $langs->trans('LabelUsedByDefault');
+ if (in_array($value, array('label', 'libelle', 'libelle_facture')) && empty($tabcomplete[$tabname[$id]]['help'][$value])) {
+ $tabcomplete[$tabname[$id]]['help'][$value] = $langs->trans('LabelUsedByDefault');
}
// Determines the name of the field in relation to the possible names
@@ -1850,10 +1852,12 @@ if ($id > 0) {
// Show field title
if ($showfield) {
- if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
- $newvaluetoshow = ''.$valuetoshow.' '.img_help(1, $valuetoshow).' ';
- } elseif (!empty($tabhelp[$id][$value])) {
- $newvaluetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+ $tooltiphelp = (isset($tabcomplete[$tabname[$id]]['help'][$value]) ? $tabcomplete[$tabname[$id]]['help'][$value] : '');
+
+ if ($tooltiphelp && preg_match('/^http(s*):/i', $tooltiphelp)) {
+ $newvaluetoshow = ''.$valuetoshow.' '.img_help(1, $valuetoshow).' ';
+ } elseif ($tooltiphelp) {
+ $newvaluetoshow = $form->textwithpicto($valuetoshow, $tooltiphelp);
} else {
$newvaluetoshow = $valuetoshow;
}
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index d01b160ca31..50e3faa7d51 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -1,5 +1,6 @@
+ * Copyright (C) 2022 Charlene Benke
*
* 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
@@ -592,15 +593,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
'recordjoinpiece'=>'AttachJoinedDocumentsToObject',
'recordevent'=>'RecordEvent');
$arrayoftypesnocondition = $arrayoftypes;
- if ($conf->projet->enabled) {
+ if (!empty($conf->projet->enabled)) {
$arrayoftypes['project'] = 'CreateLeadAndThirdParty';
}
$arrayoftypesnocondition['project'] = 'CreateLeadAndThirdParty';
- if ($conf->ticket->enabled) {
+ if (!empty($conf->ticket->enabled)) {
$arrayoftypes['ticket'] = 'CreateTicketAndThirdParty';
}
$arrayoftypesnocondition['ticket'] = 'CreateTicketAndThirdParty';
- if ($conf->recruitment->enabled) {
+ if (!empty($conf->recruitment->enabled)) {
$arrayoftypes['candidature'] = 'CreateCandidature';
}
$arrayoftypesnocondition['candidature'] = 'CreateCandidature';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index 5605fa4fb63..fcf3116a971 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -101,9 +101,14 @@ if ($action == 'update') {
if ($mode == 'template') {
dolibarr_set_const($db, "MAIN_THEME", GETPOST("main_theme", 'aZ09'), 'chaine', 0, '', $conf->entity);
- /*$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
- if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
- else dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'), 'chaine', 0, '', $conf->entity);*/
+ if (GETPOSTISSET('THEME_TOPMENU_DISABLE_IMAGE')) {
+ $val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
+ if (!$val) {
+ dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
+ } else {
+ dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'), 'chaine', 0, '', $conf->entity);
+ }
+ }
$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'), array()))));
if ($val == '') {
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index d96e0706223..abc434ed58f 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -57,6 +57,7 @@ $langs->loadLangs($langsArray);
$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
$massaction = GETPOST('massaction', 'alpha');
$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$mode = GETPOST('mode', 'aZ09');
$id = GETPOST('id', 'int');
$rowid = GETPOST('rowid', 'alpha');
@@ -619,15 +620,17 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode($limit);
}
-foreach ($search as $key => $val) {
- if (is_array($search[$key]) && count($search[$key])) {
- foreach ($search[$key] as $skey) {
- if ($skey != '') {
- $param .= '&search_'.$key.'[]='.urlencode($skey);
+if (!empty($search) && is_array($search)) {
+ foreach ($search as $key => $val) {
+ if (is_array($search[$key]) && count($search[$key])) {
+ foreach ($search[$key] as $skey) {
+ if ($skey != '') {
+ $param .= '&search_'.$key.'[]='.urlencode($skey);
+ }
}
+ } elseif ($search[$key] != '') {
+ $param .= '&search_'.$key.'='.urlencode($search[$key]);
}
- } elseif ($search[$key] != '') {
- $param .= '&search_'.$key.'='.urlencode($search[$key]);
}
}
if ($optioncss != '') {
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index dbf4ca53686..0db1b26dc7d 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -528,8 +528,8 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$moreforfilter .= '';
//$moreforfilter .= ''.$moreinfo.' '.$moreinfo2.'
';
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 72acf7fbf4f..5a51535e04d 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -60,6 +60,9 @@ if ($action == 'update') {
if (GETPOSTISSET('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH')) {
dolibarr_set_const($db, "MAIN_DOCUMENTS_WITH_PICTURE_WIDTH", GETPOST("MAIN_DOCUMENTS_WITH_PICTURE_WIDTH", 'int'), 'chaine', 0, '', $conf->entity);
}
+ if (GETPOSTISSET('INVOICE_ADD_ZATCA_QR_CODE')) {
+ dolibarr_set_const($db, "INVOICE_ADD_ZATCA_QR_CODE", GETPOST("INVOICE_ADD_ZATCA_QR_CODE", 'int'), 'chaine', 0, '', $conf->entity);
+ }
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -90,19 +93,19 @@ $tooltiptext = '';
print ''.$form->textwithpicto($langs->trans("PDFOtherDesc"), $tooltiptext)." '.$langs->trans("Project").' ';
print img_picto('', 'project', 'class="pictofixedwidth"');
- print $formproject->select_projects((empty($societe->id) ? '' : $societe->id), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+ print $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
print ' ';
print ' ';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index aeb20e6c7b4..a406bb56463 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1220,11 +1220,14 @@ class ActionComm extends CommonObject
if (!empty($this->socpeopleassigned)) {
$already_inserted = array();
- foreach (array_keys($this->socpeopleassigned) as $id) {
+ foreach (array_keys($this->socpeopleassigned) as $key => $val) {
+ if (!is_array($val)) { // For backward compatibility when val=id
+ $val = array('id'=>$val);
+ }
if (!empty($already_inserted[$val['id']])) continue;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
- $sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $id).", 0, 0, 0)";
+ $sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $val['id']).", 0, 0, 0)";
$resql = $this->db->query($sql);
if (!$resql) {
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 7d8861aded3..34dd94664e7 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -183,7 +183,8 @@ if ($user->socid && $socid) {
*/
if (GETPOST('cancel', 'alpha')) {
- $mode = 'list'; $massaction = '';
+ $mode = 'list';
+ $massaction = '';
}
if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday")) {
@@ -268,13 +269,17 @@ if (empty($reshook)) {
}
/*
- * View
+ * View
*/
$form = new Form($db);
$userstatic = new User($db);
$formactions = new FormActions($db);
+$actionstatic = new ActionComm($db);
+$societestatic = new Societe($db);
+$contactstatic = new Contact($db);
+
$nav = '';
$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
$nav .= ' ';
$searchpicto = $form->showFilterButtons();
print $searchpicto;
print ' ';
-print "\n";
+print ''."\n";
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
+// --------------------------------------------------------------------
print '';
if (!empty($arrayfields['a.id']['checked'])) {
print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['owner']['checked'])) {
print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['c.libelle']['checked'])) {
print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['a.label']['checked'])) {
print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['a.note']['checked'])) {
print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
if (!empty($arrayfields['a.datep']['checked'])) {
print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['a.datep2']['checked'])) {
print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['s.nom']['checked'])) {
print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['a.fk_contact']['checked'])) {
print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['a.fk_element']['checked'])) {
print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
-
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-
// Hook fields
$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -849,18 +862,21 @@ print $hookmanager->resPrint;
if (!empty($arrayfields['a.datec']['checked'])) {
print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['a.tms']['checked'])) {
print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
if (!empty($arrayfields['a.percent']['checked'])) {
print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+ $totalarray['nbfield']++;
}
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+$totalarray['nbfield']++;
print " \n";
-$contactstatic = new Contact($db);
$now = dol_now();
$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
@@ -869,8 +885,20 @@ $caction = new CActionComm($db);
$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
$contactListCache = array();
-while ($i < min($num, $limit)) {
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+//$savnbfield = $totalarray['nbfield'];
+//$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
+ if (empty($obj)) {
+ break; // Should not happen
+ }
+
+ // Store properties in $object
+ $object->setVarsFromFetchObj($obj);
// Discard auto action if option is on
if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') {
@@ -1087,12 +1115,20 @@ while ($i < min($num, $limit)) {
}
print '';
- print "\n";
+ print ''."\n";
+
$i++;
}
-print "
";
-print '
'.$langs->trans("NoRecordFound").' ';
print $fichinter_static->getNomUrl(1);
// Preview
- $filedir = $conf->fichinter->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+ $filedir = $conf->ficheinter->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
$file_list = null;
if (!empty($filedir)) {
$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
@@ -1283,7 +1283,7 @@ if ($object->id > 0) {
}
}
$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
- print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0, $param);
+ print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0);
}
// $filename = dol_sanitizeFileName($objp->ref);
// $filedir = $conf->fichinter->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 9069b63179f..95639a25997 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -135,7 +135,7 @@ if (GETPOST('exportcsv', 'int')) {
$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=".((int) $object->id);
+ $sql .= " WHERE mc.fk_mailing = ".((int) $object->id);
$sql .= $db->order($sortfield, $sortorder);
$resql = $db->query($sql);
@@ -365,17 +365,19 @@ if ($object->fetch($id) >= 0) {
$obj = new $classname($db);
+ // Check if qualified
+ $qualified = (is_null($obj->enabled) ? 1 : dol_eval($obj->enabled, 1));
+
// Check dependencies
- $qualified = (isset($obj->enabled) ? $obj->enabled : 1);
foreach ($obj->require_module as $key) {
- if (!$conf->$key->enabled || (!$user->admin && $obj->require_admin)) {
+ if (empty($conf->$key->enabled) || (empty($user->admin) && $obj->require_admin)) {
$qualified = 0;
//print "Les prerequis d'activation du module mailing ne sont pas respectes. Il ne sera pas actif";
break;
}
}
- // Si le module mailing est qualifie
+ // If module is qualified
if ($qualified) {
$var = !$var;
@@ -402,7 +404,7 @@ if ($object->fetch($id) >= 0) {
}
print '';
- if ($nbofrecipient >= 0) {
+ if ($nbofrecipient === '' || $nbofrecipient >= 0) {
print $nbofrecipient;
} else {
print $langs->trans("Error").' '.img_error($obj->error);
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 0c2bf539384..c944d9ab216 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -185,6 +185,11 @@ class Mailing extends CommonObject
*/
public $substitutionarray;
+ /**
+ * @var array substitutionarrayfortest
+ */
+ public $substitutionarrayfortest;
+
/**
* Constructor
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 00723597521..7e873e168ad 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -901,7 +901,7 @@ if (empty($reshook)) {
$prod_entry_mode = GETPOST('prod_entry_mode');
if ($prod_entry_mode == 'free') {
$idprod = 0;
- $tva_tx = (GETPOST('tva_tx') ? price2num(GETPOST('tva_tx')) : 0);
+ $tva_tx = (GETPOST('tva_tx') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx'))) : 0);
} else {
$idprod = GETPOST('idprod', 'int');
$tva_tx = '';
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 258e264c5a7..d28b5718c2f 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -351,8 +351,8 @@ class Proposals extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->propal->addline(
$request_data->desc,
@@ -496,8 +496,8 @@ class Proposals extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$propalline = new PropaleLigne($this->db);
$result = $propalline->fetch($lineid);
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f1423ffa12b..79f0c98ed68 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1697,8 +1697,8 @@ if ($action == 'create' && $usercancreate) {
if ($socid > 0) {
// Contacts (ask contact only if thirdparty already defined).
print "
".$langs->trans("DefaultContact").' ';
- print img_picto('', 'contact');
- print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1);
+ print img_picto('', 'contact', 'class="pictofixedwidth"');
+ print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1, 'maxwidth200 widthcentpercentminusx');
print ' ';
// Ligne info remises tiers
@@ -1755,7 +1755,7 @@ if ($action == 'create' && $usercancreate) {
// Shipping Method
if (!empty($conf->expedition->enabled)) {
print '
'.$langs->trans('SendingMethod').' ';
- print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
+ print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
print ' ';
}
@@ -2735,7 +2735,7 @@ if ($action == 'create' && $usercancreate) {
}
// Create intervention
- if ($conf->ficheinter->enabled) {
+ if (!empty($conf->ficheinter->enabled)) {
$langs->load("interventions");
if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0) {
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index ac9ce98777d..2c916abda9a 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -350,8 +350,8 @@ class Orders extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->commande->addline(
$request_data->desc,
@@ -418,8 +418,8 @@ class Orders extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->commande->updateline(
$lineid,
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a7d237bc780..44cc5c6effd 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -359,7 +359,7 @@ class Commande extends CommonOrder
'pos_source' =>array('type'=>'varchar(32)', 'label'=>'POSTerminal', 'enabled'=>1, 'visible'=>-1, 'position'=>280),
'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>300),
'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>302),
- 'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>304),
+ 'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>304),
'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>306),
'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>400),
'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 23d4c2eefbb..8e38d1ffe78 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -250,7 +250,7 @@ class BankAccounts extends DolibarrApi
}
// Clean data
- $description = checkVal($description, 'alphanohtml');
+ $description = sanitizeVal($description, 'alphanohtml');
/**
@@ -498,13 +498,13 @@ class BankAccounts extends DolibarrApi
throw new RestException(404, 'account not found');
}
- $type = checkVal($type);
- $label = checkVal($label);
- $cheque_number = checkVal($cheque_number);
- $cheque_writer = checkVal($cheque_writer);
- $cheque_bank = checkVal($cheque_bank);
- $accountancycode = checkVal($accountancycode);
- $num_releve = checkVal($num_releve);
+ $type = sanitizeVal($type);
+ $label = sanitizeVal($label);
+ $cheque_number = sanitizeVal($cheque_number);
+ $cheque_writer = sanitizeVal($cheque_writer);
+ $cheque_bank = sanitizeVal($cheque_bank);
+ $accountancycode = sanitizeVal($accountancycode);
+ $num_releve = sanitizeVal($num_releve);
$result = $account->addline(
$date,
@@ -557,9 +557,9 @@ class BankAccounts extends DolibarrApi
throw new RestException(404, 'account line not found');
}
- $url = checkVal($url);
- $label = checkVal($label);
- $type = checkVal($type);
+ $url = sanitizeVal($url);
+ $label = sanitizeVal($label);
+ $type = sanitizeVal($type);
$result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
if ($result < 0) {
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 90bc79483bf..8e6fb27d5f0 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -616,9 +616,18 @@ foreach ($accounts as $key => $type) {
// Transactions to reconcile
if (!empty($arrayfields['toreconcile']['checked'])) {
- print '
';
-
$conciliate = $objecttmp->canBeConciliated();
+
+ $labeltoshow = '';
+ if ($conciliate == -2) {
+ $labeltoshow = $langs->trans("CashAccount");
+ } elseif ($conciliate == -3) {
+ $labeltoshow = $langs->trans("Closed");
+ } elseif (empty($objecttmp->rappro)) {
+ $labeltoshow = $langs->trans("ConciliationDisabled");
+ }
+
+ print ' ';
if ($conciliate == -2) {
print ''.$langs->trans("CashAccount").' ';
} elseif ($conciliate == -3) {
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 149710c975b..2b6b027d7ce 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -647,7 +647,7 @@ if (empty($action) || $action == "view" || $action == "close") {
print '';
print '';
- print '>';
+ print '
';
print '
';
print '
';
@@ -659,11 +659,11 @@ if (empty($action) || $action == "view" || $action == "close") {
print '';
print ''.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").' ';
- print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
+ print ''.price($object->opening, 0, $langs, 1, -1, -1, $conf->currency).' ';
print " '.$langs->trans($val).' ';
- print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
+ print ''.price($object->$key, 0, $langs, 1, -1, -1, $conf->currency).' ';
print " ';
- if ($obj->totalpaye) {
- print price($obj->totalpaye);
+ if ($obj->totalpaid) {
+ print price($obj->totalpaid);
}
print ' ';
print '';
$total = $total + $obj->total;
$totalnb = $totalnb + $obj->nb;
- $totalpaye = $totalpaye + $obj->totalpaye;
+ $totalpaid = $totalpaid + $obj->totalpaid;
$i++;
}
print ''.$langs->trans("Total").' ';
@@ -258,7 +258,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
if (!empty($conf->banque->enabled)) {
print ''.price($totalpaye)." ";
+ print ''.price($totalpaid)." ";
print "'.price($next_invoice->total_ht).' '.price($next_invoice->total_ttc).' '.$next_invoice->getLibStatut(3, $totalpaye).' ';
+ print ''.$next_invoice->getLibStatut(3, $totalpaid).' ';
print '';
}
@@ -5072,7 +5072,7 @@ if ($action == 'create') {
} else {
print $langs->trans('AlreadyPaid');
}
- print ''.price($totalpaye).' ';
+ print ''.price($totalpaid).' ';
$resteapayeraffiche = $resteapayer;
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
@@ -5125,7 +5125,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
print ' ';
- print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' ';
+ print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).' ';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -5135,7 +5135,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
print ' ';
- print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' ';
+ print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).' ';
// $resteapayeraffiche=0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -5145,7 +5145,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
print ' ';
- print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' ';
+ print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).' ';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -5159,7 +5159,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
print ' ';
- print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).' ';
+ print ''.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).' ';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -5220,7 +5220,7 @@ if ($action == 'create') {
// Total already paid back
print '';
print ''.$langs->trans('AlreadyPaidBack').' ';
- print ' '.price($sign * $totalpaye).' '.price($sign * $totalpaid).' ';
// Billed
print ''.$langs->trans("Billed").' '.price($sign * $object->total_ttc).' '.$langs->trans('ClassifyPaidPartially').' ';
} else {
@@ -5575,7 +5575,7 @@ if ($action == 'create') {
// For situation invoice with excess received
if ($object->statut > Facture::STATUS_DRAFT
&& $object->type == Facture::TYPE_SITUATION
- && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
+ && ($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits) > 0
&& $usercancreate
&& !$objectidnext
&& $object->is_last_in_cycle()
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 8a8a9667a28..a864168d161 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -428,8 +428,8 @@ class Invoices extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->invoice->updateline(
$lineid,
@@ -718,8 +718,8 @@ class Invoices extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
// Reset fk_parent_line for no child products and special product
if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
@@ -1425,10 +1425,10 @@ class Invoices extends DolibarrApi
}
// Calculate amount to pay
- $totalpaye = $this->invoice->getSommePaiement();
+ $totalpaid = $this->invoice->getSommePaiement();
$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
$totaldeposits = $this->invoice->getSumDepositsUsed();
- $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ $resteapayer = price2num($this->invoice->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
$this->db->begin();
@@ -1567,10 +1567,10 @@ class Invoices extends DolibarrApi
}
// Calculate amount to pay
- $totalpaye = $this->invoice->getSommePaiement($is_multicurrency);
+ $totalpaid = $this->invoice->getSommePaiement($is_multicurrency);
$totalcreditnotes = $this->invoice->getSumCreditNotesUsed($is_multicurrency);
$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
- $remainstopay = $amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ $remainstopay = $amount = price2num($total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
if (!$is_multicurrency && $amountarray["amount"] != 'remain') {
$amount = price2num($amountarray["amount"], 'MT');
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 927da1bf17a..34df7bcf097 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -1333,6 +1333,11 @@ class FactureRec extends CommonInvoice
$facture->status = self::STATUS_DRAFT;
$facture->date = (empty($facturerec->date_when) ? $now : $facturerec->date_when); // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
$facture->socid = $facturerec->socid;
+ if (!empty($facturerec->fk_multicurrency)) {
+ $facture->fk_multicurrency = $facturerec->fk_multicurrency;
+ $facture->multicurrency_code = $facturerec->multicurrency_code;
+ $facture->multicurrency_tx = $facturerec->multicurrency_tx;
+ }
$invoiceidgenerated = $facture->create($user);
if ($invoiceidgenerated <= 0) {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 64d83cb2123..a2c22d7f878 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5214,13 +5214,13 @@ class Facture extends CommonInvoice
$hasDelay = $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay);
if ($hasDelay && !empty($this->retained_warranty) && !empty($this->retained_warranty_date_limit)) {
- $totalpaye = $this->getSommePaiement();
- $totalpaye = floatval($totalpaye);
+ $totalpaid = $this->getSommePaiement();
+ $totalpaid = floatval($totalpaid);
$RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
- if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0) {
- if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay)) {
+ if ($totalpaid >= 0 && $RetainedWarrantyAmount >= 0) {
+ if (($totalpaid < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay)) {
$hasDelay = 1;
- } elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay)) {
+ } elseif ($totalpaid < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay)) {
$hasDelay = 1;
} else {
$hasDelay = 0;
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 301f16fb4a5..45ce97a480f 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) {
$head = facture_prepare_head($object);
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
print dol_get_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
@@ -171,7 +171,7 @@ if ($id > 0 || !empty($ref)) {
}
$morehtmlref .= '';
- $object->totalpaid = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 03e4a0b4577..f55e9c4b36f 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -117,7 +117,7 @@ if ($id > 0 || !empty($ref)) {
$head = facture_prepare_head($object);
print dol_get_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
// Build file list
$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -172,7 +172,7 @@ if ($id > 0 || !empty($ref)) {
}
$morehtmlref .= '';
- $object->totalpaid = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index f524d49eb97..ceea7dcbb62 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -84,7 +84,7 @@ $object->info($object->id);
$head = facture_prepare_head($object);
print dol_get_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), -1, 'bill');
-$totalpaye = $object->getSommePaiement();
+$totalpaid = $object->getSommePaiement();
// Invoice content
@@ -131,7 +131,7 @@ if (!empty($conf->projet->enabled)) {
}
$morehtmlref .= '';
-$object->totalpaid = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6fd1e2a7322..54de9440b8b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -141,7 +141,6 @@ $search_btn = GETPOST('button_search', 'alpha');
$search_remove_btn = GETPOST('button_removefilter', 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
-
$option = GETPOST('search_option');
if ($option == 'late') {
$search_status = '1';
@@ -472,10 +471,10 @@ if ($action == 'makepayment_confirm' && !empty($user->rights->facture->paiement)
$objecttmp = new Facture($db);
$result = $objecttmp->fetch($toselectid);
if ($result > 0) {
- $totalpaye = $objecttmp->getSommePaiement();
+ $totalpaid = $objecttmp->getSommePaiement();
$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
$totaldeposits = $objecttmp->getSumDepositsUsed();
- $objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ $objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
if ($objecttmp->statut == Facture::STATUS_DRAFT) {
$error++;
setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index fe3bb736ea4..cab6d3ac680 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -99,7 +99,7 @@ if ($id > 0 || !empty($ref)) {
$head = facture_prepare_head($object);
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
print dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
@@ -148,7 +148,7 @@ if ($id > 0 || !empty($ref)) {
}
$morehtmlref .= '';
- $object->totalpaid = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 33d6af875ff..9123a62cec2 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -236,16 +236,16 @@ llxHeader('', $title, $helpurl);
if ($object->id > 0) {
$selleruserevenustamp = $mysoc->useRevenueStamp();
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
$totalcreditnotes = $object->getSumCreditNotesUsed();
$totaldeposits = $object->getSumDepositsUsed();
- //print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
+ //print "totalpaid=".$totalpaid." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
// We can also use bcadd to avoid pb with floating points
// For example print 239.2 - 229.3 - 9.9; does not return 0.
- //$resteapayer=bcadd($object->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+ //$resteapayer=bcadd($object->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);
//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
- $resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ $resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
if ($object->paye) {
$resteapayer = 0;
@@ -384,7 +384,7 @@ if ($object->id > 0) {
}
$morehtmlref .= '';
- $object->totalpaid = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $moreparam, 0, '', '');
@@ -667,7 +667,7 @@ if ($object->id > 0) {
// Total with tax
print ''.$langs->trans('AmountTTC').' '.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).' '.$langs->trans('RemainderToPay').' '.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).' ';
-//print getCustomerInvoicePieChart($socid);
print getNumberInvoicesPieChart('customers');
print '
';
print getNumberInvoicesPieChart('fourn');
-//print getPurchaseInvoicePieChart($socid);
print '
';
print getCustomerInvoiceDraftTable($max, $socid);
print '
';
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 234073cdb38..28d095715c2 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -293,7 +293,7 @@ $mend = $tmp['mon'];
$total = 0;
$subtotalcoll = 0;
-$subtotalpaye = 0;
+$subtotalpaid = 0;
$subtotal = 0;
$i = 0;
$mcursor = 0;
@@ -536,7 +536,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) { // $
print '
'.price(price2num($x_paye_sum, 'MT')).' ';
$subtotalcoll = $subtotalcoll + $x_coll_sum;
- $subtotalpaye = $subtotalpaye + $x_paye_sum;
+ $subtotalpaid = $subtotalpaid + $x_paye_sum;
$diff = $x_coll_sum - $x_paye_sum;
$total = $total + $diff;
@@ -552,12 +552,12 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) { // $
print '
';
print ''.$langs->trans("SubTotal").' :'.price(price2num($subtotalcoll, 'MT')).' ';
- print ''.price(price2num($subtotalpaye, 'MT')).' ';
+ print ''.price(price2num($subtotalpaid, 'MT')).' ';
print ''.price(price2num($subtotal, 'MT')).' ';
print ' ';
$i = 0;
$subtotalcoll = 0;
- $subtotalpaye = 0;
+ $subtotalpaid = 0;
$subtotal = 0;
}
}
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 2306e99899b..bd5c114e983 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -52,7 +52,7 @@ $hookmanager->initHooks(array('paymentcard', 'globalcard'));
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
-$result = restrictedArea($user, $object->element, $object->id, 'paiement', '');
+$result = restrictedArea($user, $object->element, $object->id, 'paiement');
// Security check
if ($user->socid) {
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 451a18ab05b..3fb82f05cb9 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -200,8 +200,9 @@ class RemiseCheque extends CommonObject
}
}
+ $lines = array();
+
if ($this->id > 0 && $this->errno == 0) {
- $lines = array();
$sql = "SELECT b.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql .= " WHERE b.fk_type = 'CHQ'";
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index df142fb6531..8cde488a2e0 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -394,10 +394,10 @@ class BonPrelevement extends CommonObject
$amounts[$fac->id] = $facs[$i][1];
$amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
- $totalpaye = $fac->getSommePaiement();
+ $totalpaid = $fac->getSommePaiement();
$totalcreditnotes = $fac->getSumCreditNotesUsed();
$totaldeposits = $fac->getSumDepositsUsed();
- $alreadypayed = $totalpaye + $totalcreditnotes + $totaldeposits;
+ $alreadypayed = $totalpaid + $totalcreditnotes + $totaldeposits;
// @TODO Move this after creation of payment
if (price2num($alreadypayed + $facs[$i][1], 'MT') == $fac->total_ttc) {
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index d98a6aab251..8b2bf351094 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -158,7 +158,7 @@ if ($id > 0) {
print $fac->error."
";
continue;
}
- $totalpaye = $fac->getSommePaiement();
+ $totalpaid = $fac->getSommePaiement();
$userstatic->id = $objf->userid;
$userstatic->login = $objf->login;
@@ -168,7 +168,7 @@ if ($id > 0) {
'date' => $fac->date,
'datefieldforsort' => $fac->date.'-'.$fac->ref,
'link' => $fac->getNomUrl(1),
- 'status' => $fac->getLibStatut(2, $totalpaye),
+ 'status' => $fac->getLibStatut(2, $totalpaid),
'amount' => $fac->total_ttc,
'author' => $userstatic->getLoginUrl(1)
);
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index b586d4c88a6..f16b7f2960c 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -166,8 +166,8 @@ if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
// Delete social contribution
if ($action == 'confirm_delete' && $confirm == 'yes') {
$object->fetch($id);
- $totalpaye = $object->getSommePaiement();
- if (empty($totalpaye)) {
+ $totalpaid = $object->getSommePaiement();
+ if (empty($totalpaid)) {
$result = $object->delete($user);
if ($result > 0) {
header("Location: list.php");
@@ -454,7 +454,7 @@ if ($id > 0) {
if ($result > 0) {
$head = tax_prepare_head($object);
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
// Clone confirmation
if ($action === 'clone') {
@@ -576,7 +576,7 @@ if ($id > 0) {
$linkback = '
'.$langs->trans("BackToList").' ';
- $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
@@ -690,7 +690,7 @@ if ($id > 0) {
//print $sql;
$resql = $db->query($sql);
if ($resql) {
- $totalpaye = 0;
+ $totalpaid = 0;
$num = $db->num_rows($resql);
$i = 0;
@@ -748,7 +748,7 @@ if ($id > 0) {
}
print '
'.price($objp->amount)." \n";
print "";
- $totalpaye += $objp->amount;
+ $totalpaid += $objp->amount;
$i++;
}
} else {
@@ -757,10 +757,10 @@ if ($id > 0) {
print '';
}
- print '
'.$langs->trans("AlreadyPaid").' : '.price($totalpaye)." \n";
+ print '
'.$langs->trans("AlreadyPaid").' : '.price($totalpaid)." \n";
print '
'.$langs->trans("AmountExpected").' : '.price($object->amount)." \n";
- $resteapayer = $object->amount - $totalpaye;
+ $resteapayer = $object->amount - $totalpaid;
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
print '
'.$langs->trans("RemainderToPay")." : ";
@@ -820,7 +820,7 @@ if ($id > 0) {
}
// Delete
- if ($user->rights->tax->charges->supprimer && empty($totalpaye)) {
+ if ($user->rights->tax->charges->supprimer && empty($totalpaid)) {
print '';
} else {
print '';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 41e036ae937..3b9019868ec 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -118,6 +118,7 @@ class ChargeSociales extends CommonObject
*/
public $total;
+ public $totalpaid;
const STATUS_UNPAID = 0;
const STATUS_PAID = 1;
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 6918b2c84ee..3de8687433f 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -139,7 +139,9 @@ if ($object->id) {
$linkback = ''.$langs->trans("BackToList").' ';
- $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $alreadypayed; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+
+ $morehtmlright = '';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 4c49a3008c6..8363459171b 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -81,6 +81,8 @@ $object->info($id);
$head = tax_prepare_head($object);
+$alreadypayed = $object->getSommePaiement();
+
print dol_get_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, $object->picto);
$morehtmlref = '';
@@ -106,8 +108,9 @@ $morehtmlref .= '
';
$linkback = ''.$langs->trans("BackToList").' ';
-$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$object->totalpaid = $alreadypayed; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$morehtmlright = '';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
print '';
diff --git a/htdocs/compta/sociales/note.php b/htdocs/compta/sociales/note.php
index cf9d0cbdec5..0447d3168b1 100644
--- a/htdocs/compta/sociales/note.php
+++ b/htdocs/compta/sociales/note.php
@@ -113,7 +113,9 @@ if ($id > 0 || !empty($ref)) {
// ------------------------------------------------------------
$linkback = '
'.$langs->trans("BackToList").' ';
- //$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ //$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+
+ $morehtmlright = '';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 43e9d5d4668..d2646d241ea 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -137,7 +137,7 @@ print '
';
$sql = "SELECT c.id, c.libelle as type_label,";
$sql .= " cs.rowid, cs.libelle as label_sc, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total, cs.paye,";
-$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
+$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaid, pc.num_paiement as num_payment, pc.fk_bank,";
$sql .= " pct.code as payment_code,";
$sql .= " u.rowid uid, u.lastname, u.firstname, u.email, u.login, u.admin,";
$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel, ba.iban_prefix as iban, ba.bic, ba.currency_code, ba.clos";
@@ -253,7 +253,7 @@ if (!$resql) {
$i = 0;
$total = 0;
$totalnb = 0;
-$totalpaye = 0;
+$totalpaid = 0;
while ($i < min($num, $limit)) {
$obj = $db->fetch_object($resql);
@@ -346,8 +346,8 @@ while ($i < min($num, $limit)) {
// Paid
print '
';
- if ($obj->totalpaye) {
- print ''.price($obj->totalpaye).' ';
+ if ($obj->totalpaid) {
+ print ''.price($obj->totalpaid).' ';
}
print ' ';
@@ -357,7 +357,7 @@ while ($i < min($num, $limit)) {
$total = $total + $obj->total;
$totalnb = $totalnb + $obj->nb;
- $totalpaye = $totalpaye + $obj->totalpaye;
+ $totalpaid = $totalpaid + $obj->totalpaid;
$i++;
}
@@ -373,7 +373,7 @@ if (!empty($conf->banque->enabled)) {
print '
';
print '
';
}
-print '
'.price($totalpaye)." ";
+print '
'.price($totalpaid)." ";
print '
';
print "
";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 26f8e754dd2..e40b9b9b409 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -273,9 +273,9 @@ if ($action == 'add' && !$cancel) {
if ($action == 'confirm_delete' && $confirm == 'yes') {
$result = $object->fetch($id);
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
- if (empty($totalpaye)) {
+ if (empty($totalpaid)) {
$db->begin();
$ret = $object->delete($user);
@@ -540,7 +540,7 @@ if ($action == 'create') {
if ($id > 0) {
$head = vat_prepare_head($object);
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
// Clone confirmation
if ($action === 'clone') {
@@ -580,7 +580,7 @@ if ($id > 0) {
$linkback = '
'.$langs->trans("BackToList").' ';
- $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
@@ -683,7 +683,7 @@ if ($id > 0) {
//print $sql;
$resql = $db->query($sql);
if ($resql) {
- $totalpaye = 0;
+ $totalpaid = 0;
$num = $db->num_rows($resql);
$i = 0;
@@ -735,7 +735,7 @@ if ($id > 0) {
}
print '
'.price($objp->amount)." \n";
print "";
- $totalpaye += $objp->amount;
+ $totalpaid += $objp->amount;
$i++;
}
} else {
@@ -744,10 +744,10 @@ if ($id > 0) {
print '';
}
- print '
'.$langs->trans("AlreadyPaid")." : ".price($totalpaye)." \n";
+ print '
'.$langs->trans("AlreadyPaid")." : ".price($totalpaid)." \n";
print '
'.$langs->trans("AmountExpected")." : ".price($object->amount)." \n";
- $resteapayer = $object->amount - $totalpaye;
+ $resteapayer = $object->amount - $totalpaid;
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
print '
'.$langs->trans("RemainderToPay")." : ";
@@ -810,7 +810,7 @@ if ($id > 0) {
print '";
}
- if (!empty($user->rights->tax->charges->supprimer) && empty($totalpaye)) {
+ if (!empty($user->rights->tax->charges->supprimer) && empty($totalpaid)) {
print '';
} else {
print '';
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index cbdb4887869..b7500fffaa0 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -101,6 +101,13 @@ class PaymentVAT extends CommonObject
*/
public $chid;
+ /**
+ * @var string lib
+ * @deprecated
+ * @see $label
+ */
+ public $lib;
+
/**
* @var integer|string datepaye
*/
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index b30cc185a98..f54ed42fb06 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -62,6 +62,11 @@ class Tva extends CommonObject
public $type_payment;
public $num_payment;
+ /**
+ * @var integer|string totalpaid
+ */
+ public $totalpaid;
+
/**
* @var string label
*/
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index a0573cf2812..22b3f988a70 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -125,8 +125,9 @@ if ($object->id) {
$linkback = ''.$langs->trans("BackToList").' ';
- $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $morehtmlright = '';
dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
print '';
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index fed0cf209c1..16b24361160 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -255,7 +255,7 @@ if ($refresh === true) {
//var_dump($m);
$total = 0;
$subtotalcoll = 0;
- $subtotalpaye = 0;
+ $subtotalpaid = 0;
$subtotal = 0;
$i = 0;
$mcursor = 0;
@@ -481,7 +481,7 @@ if ($refresh === true) {
print '
' . price(price2num($x_paye_sum, 'MT')) . ' ';
$subtotalcoll = $subtotalcoll + $x_coll_sum;
- $subtotalpaye = $subtotalpaye + $x_paye_sum;
+ $subtotalpaid = $subtotalpaid + $x_paye_sum;
$diff = $x_coll_sum - $x_paye_sum;
$total = $total + $diff;
@@ -498,12 +498,12 @@ if ($refresh === true) {
print '
';
print '' . $langs->trans("SubTotal") . ' :' . price(price2num($subtotalcoll, 'MT')) . ' ';
- print '' . price(price2num($subtotalpaye, 'MT')) . ' ';
+ print '' . price(price2num($subtotalpaid, 'MT')) . ' ';
print '' . price(price2num($subtotal, 'MT')) . ' ';
print ' ';
$i = 0;
$subtotalcoll = 0;
- $subtotalpaye = 0;
+ $subtotalpaid = 0;
$subtotal = 0;
}
}
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index cf91df3a775..0279acdeaa4 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -5,7 +5,7 @@
* Copyright (C) 2011-2016 Alexandre Spangaro
* Copyright (C) 2011-2014 Juanjo Menent
* Copyright (C) 2015 Jean-François Ferry
- * Copyright (C) 2021 Gauthier VERDOL
+ * Copyright (C) 2021 Gauthier VERDOL
*
* 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
@@ -141,7 +141,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
$sql = "SELECT tva.rowid, tva.label as label, b.fk_account, ptva.fk_bank";
$sql .= ", tva.datev";
$sql .= ", tva.amount as total,";
- $sql .= " ptva.rowid as pid, ptva.datep, ptva.amount as totalpaye, ptva.num_paiement as num_payment,";
+ $sql .= " ptva.rowid as pid, ptva.datep, ptva.amount as totalpaid, ptva.num_paiement as num_payment,";
$sql .= " pct.code as payment_code";
$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva,";
$sql .= " ".MAIN_DB_PREFIX."payment_vat as ptva";
@@ -175,11 +175,15 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
$i = 0;
$total = 0;
$totalnb = 0;
- $totalpaye = 0;
+ $totalpaid = 0;
while ($i < min($num, $limit)) {
$obj = $db->fetch_object($resql);
+ $tva->id = $obj->rowid;
+ $tva->ref = $obj->rowid;
+ $tva->label = $obj->label;
+
$payment_vat_static->id = $obj->pid;
$payment_vat_static->ref = $obj->pid;
@@ -190,31 +194,32 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
// VAT
print '';
- $tva->id = $obj->rowid;
- $tva->ref = $obj->rowid;
- $tva->label = $obj->label;
print $tva->getNomUrl(1, '20');
print ' ';
// Label
- print ''.$obj->label.' ';
+ print ''.dol_escape_htmltag($obj->label).' ';
// Date
- $date = $obj->datev;
- print ''.dol_print_date($date, 'day').' ';
+ $date = $db->jdate($obj->datev);
+ print ''.dol_print_date($date, 'day').' ';
// Date payment
- print ''.dol_print_date($db->jdate($obj->datep), 'day').' ';
+ $datep = $db->jdate($obj->datep);
+ print ''.dol_print_date($datep, 'day').' ';
// Type payment
- print '';
+ $labelpaymenttype = '';
if ($obj->payment_code) {
- print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+ $labelpaymenttype = $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
}
+
+ print ' ';
+ print dol_escape_htmltag($labelpaymenttype);
print ' ';
// Chq number
- print ''.$obj->num_payment.' ';
+ print ''.dol_escape_htmltag($obj->num_payment).' ';
if (!empty($conf->banque->enabled)) {
// Bank transaction
@@ -231,21 +236,20 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
print '';
}
- // Type
- //print ''.$obj->type_label.' '.price($obj->total).' ';
- if ($obj->totalpaye) {
- print price($obj->totalpaye);
+ if ($obj->totalpaid) {
+ print price($obj->totalpaid);
}
print ' ';
$total = $total + $obj->total;
$totalnb = $totalnb + $obj->nb;
- $totalpaye = $totalpaye + $obj->totalpaye;
+ $totalpaid = $totalpaid + $obj->totalpaid;
$i++;
}
@@ -260,7 +264,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
}
print '
';
print '
';
- print '
'.price($totalpaye)." ";
+ print '
'.price($totalpaid)." ";
print "";
} else {
dol_print_error($db);
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 0eed6ba6219..98b6ccea3b1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -251,17 +251,17 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$objthirdparty = $object->thirdparty;
$out = '';
- $permok = $user->rights->agenda->myactions->create;
- if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
- if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
- $out .= '&originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&socid='.$objthirdparty->id : '');
- }
- $out .= (!empty($objcon->id) ? '&contactid='.$objcon->id : '').'&origin=contact&originid='.$object->id.'&percentage=-1&backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
- $out .= '&datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
- }
-
$newcardbutton = '';
if (!empty($conf->agenda->enabled)) {
+ $permok = $user->rights->agenda->myactions->create;
+ if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+ if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
+ $out .= '&originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&socid='.$objthirdparty->id : '');
+ }
+ $out .= (!empty($objcon->id) ? '&contactid='.$objcon->id : '').'&origin=contact&originid='.$object->id.'&percentage=-1&backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
+ $out .= '&datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
+ }
+
if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
}
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 1cef1901917..cd12fd12150 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -235,6 +236,9 @@ if (empty($reshook)) {
$object->birthday = dol_mktime(0, 0, 0, GETPOST("birthdaymonth", 'int'), GETPOST("birthdayday", 'int'), GETPOST("birthdayyear", 'int'));
$object->birthday_alert = GETPOST("birthday_alert", 'alpha');
+ //Default language
+ $object->default_lang = GETPOST('default_lang');
+
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) {
@@ -437,6 +441,9 @@ if (empty($reshook)) {
$object->roles = GETPOST("roles", 'array'); // Note GETPOSTISSET("role") is null when combo is empty
+ //Default language
+ $object->default_lang = GETPOST('default_lang');
+
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
if ($ret < 0) {
@@ -557,6 +564,7 @@ if (empty($reshook)) {
*/
$form = new Form($db);
+$formadmin = new FormAdmin($db);
$formcompany = new FormCompany($db);
$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
@@ -635,7 +643,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$object->country = $tmparray['label'];
}
- $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
+ $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress"));
$linkback = '';
print load_fiche_titre($title, $linkback, 'address');
@@ -872,6 +880,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print $form->selectarray('priv', $selectarray, (GETPOST("priv", 'alpha') ?GETPOST("priv", 'alpha') : $object->priv), 0);
print '';
+ //Default language
+ if (!empty($conf->global->MAIN_MULTILANGS)) {
+ print '
'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).' '."\n";
+ print $formadmin->select_language(GETPOST('default_lang', 'alpha') ?GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone', 0, 0, 0, null, 1);
+
+ print ' ';
+ print '';
+ }
+
// Categories
if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
print '
'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).' ';
@@ -1151,6 +1168,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print $form->selectarray('priv', $selectarray, $object->priv, 0);
print ' ';
+ //Default language
+ if (!empty($conf->global->MAIN_MULTILANGS)) {
+ print '
'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).' '."\n";
+ print $formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
+
+ print ' ';
+ print '';
+ }
+
// Note Public
print '
'.$langs->trans("NotePublic").' ';
$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
@@ -1363,6 +1389,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print ' ';
}
+ // Default language
+ if (!empty($conf->global->MAIN_MULTILANGS)) {
+ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+ print '
'.$langs->trans("DefaultLang").' ';
+ //$s=picto_from_langcode($object->default_lang);
+ //print ($s?$s.' ':'');
+ $langs->load("languages");
+ $labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang.'_'.strtoupper($object->default_lang)) : '');
+ print $labellang;
+ print ' ';
+ }
+
print '
'.$langs->trans("ContactVisibility").' ';
print $object->LibPubPriv($object->priv);
print ' ';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 587972fa83b..922da9c30a8 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -130,6 +130,13 @@ class Contact extends CommonObject
public $civility_code;
public $civility;
+ /**
+ * @var string The civilite code, not an integer
+ * @deprecated
+ * @see $civility_code
+ */
+ public $civilite;
+
/**
* @var string Address
*/
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 7f1d9bdc64b..b7fc682d2c6 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -153,16 +153,16 @@ print '';
if ($object->thirdparty->client) {
$thirdTypeArray['customer'] = $langs->trans("customer");
- if ($conf->propal->enabled && $user->rights->propal->lire) {
+ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
}
- if ($conf->commande->enabled && $user->rights->commande->lire) {
+ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
}
- if ($conf->facture->enabled && $user->rights->facture->lire) {
+ if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
}
- if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
}
}
@@ -366,7 +366,7 @@ $param .= "&socid=".urlencode($socid);
$param .= "&type_element=".urlencode($type_element);
$total_qty = 0;
-
+$num=0;
if ($sql_select) {
$resql = $db->query($sql);
if (!$resql) {
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 93d61f8a903..e68274ecff2 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -132,31 +132,31 @@ if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('b
}
$offset = $limit * $page;
-$titre = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
if ($type == "p") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactprospectlist';
}
- $titre .= ' ('.$langs->trans("ThirdPartyProspects").')';
+ $title .= ' ('.$langs->trans("ThirdPartyProspects").')';
$urlfiche = "card.php";
}
if ($type == "c") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactcustomerlist';
}
- $titre .= ' ('.$langs->trans("ThirdPartyCustomers").')';
+ $title .= ' ('.$langs->trans("ThirdPartyCustomers").')';
$urlfiche = "card.php";
} elseif ($type == "f") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactsupplierlist';
}
- $titre .= ' ('.$langs->trans("ThirdPartySuppliers").')';
+ $title .= ' ('.$langs->trans("ThirdPartySuppliers").')';
$urlfiche = "card.php";
} elseif ($type == "o") {
if (empty($contextpage) || $contextpage == 'contactlist') {
$contextpage = 'contactotherlist';
}
- $titre .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
+ $title .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
$urlfiche = "";
}
@@ -709,7 +709,7 @@ print '
';
print '
';
print '
';
-print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
$topicmail = "Information";
$modelmail = "contact";
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 5e534f3e43c..ea228550cae 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -278,8 +278,8 @@ class Contracts extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->price_base_type = checkVal($request_data->price_base_type);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->price_base_type = sanitizeVal($request_data->price_base_type);
$updateRes = $this->contract->addline(
$request_data->desc,
@@ -336,8 +336,8 @@ class Contracts extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->price_base_type = checkVal($request_data->price_base_type);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->price_base_type = sanitizeVal($request_data->price_base_type);
$updateRes = $this->contract->updateline(
$lineid,
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 85b854f8ba7..fb4461f94e3 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -28,6 +28,7 @@
// $permissiontodelete must be defined
// $backurlforlist must be defined
// $backtopage may be defined
+// $noback may be defined
// $triggermodname may be defined
if (!empty($permissionedit) && empty($permissiontoadd)) {
@@ -137,8 +138,11 @@ if ($action == 'add' && !empty($permissiontoadd)) {
}
$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
- header("Location: ".$urltogo);
- exit;
+
+ if (!empty($noback)) {
+ header("Location: " . $urltogo);
+ exit;
+ }
} else {
$error++;
// Creation KO
@@ -311,8 +315,10 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete)) {
// Delete OK
setEventMessages("RecordDeleted", null, 'mesgs');
- header("Location: ".$backurlforlist);
- exit;
+ if (!empty($noback)) {
+ header("Location: " . $backurlforlist);
+ exit;
+ }
} else {
$error++;
if (!empty($object->errors)) {
@@ -355,8 +361,10 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
- header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
- exit;
+ if (!empty($noback)) {
+ header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+ exit;
+ }
} else {
$error++;
setEventMessages($object->error, $object->errors, 'errors');
@@ -494,8 +502,10 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
$newid = $result;
}
- header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
- exit;
+ if (!empty($noback)) {
+ header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $newid); // Open record of new object
+ exit;
+ }
} else {
$error++;
setEventMessages($objectutil->error, $objectutil->errors, 'errors');
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index ce9ae57864d..994ba5c42f3 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -129,8 +129,12 @@ if ($action == "importSignature") {
$pdf->AddPage();
$pagecount = $pdf->setSourceFile($upload_dir.$ref.".pdf"); // original PDF
- $tppl = $pdf->importPage(1);
- $pdf->useTemplate($tppl);
+ for ($i=1;$i<($pagecount+1);$i++) {
+ if ($i>1) $pdf->AddPage();
+ $tppl=$pdf->importPage($i);
+ $pdf->useTemplate($tppl);
+ }
+
$pdf->Image($upload_dir.$filename, 129, 239.6, 60, 15); // FIXME Position will be wrong with non A4 format. Use a value from width and height of page minus relative offset.
$pdf->Close();
$pdf->Output($newpdffilename, "F");
diff --git a/htdocs/core/boxes/box_graph_nb_tickets_type.php b/htdocs/core/boxes/box_graph_nb_tickets_type.php
index 88d930e9e27..6b25f5d84d0 100644
--- a/htdocs/core/boxes/box_graph_nb_tickets_type.php
+++ b/htdocs/core/boxes/box_graph_nb_tickets_type.php
@@ -131,7 +131,7 @@ class box_graph_nb_tickets_type extends ModeleBoxes
}
foreach ($listofoppcode as $rowid => $code) {
$dataseries[] = array(
- 'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_category', 'code', 'label', $code),
+ 'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_type', 'code', 'label', $code),
'data' => (empty($data[$code]) ? 0 : $data[$code])
);
}
diff --git a/htdocs/core/boxes/box_graph_ticket_by_severity.php b/htdocs/core/boxes/box_graph_ticket_by_severity.php
index 3c8756cf544..c668894d991 100644
--- a/htdocs/core/boxes/box_graph_ticket_by_severity.php
+++ b/htdocs/core/boxes/box_graph_ticket_by_severity.php
@@ -152,7 +152,7 @@ class box_graph_ticket_by_severity extends ModeleBoxes
}
foreach ($listofoppcode as $rowid => $code) {
$dataseries[] = array(
- 'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_category', 'code', 'label', $code),
+ 'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code),
'data' => (empty($data[$code]) ? 0 : $data[$code])
);
}
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
new file mode 100644
index 00000000000..ab1023b81f5
--- /dev/null
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -0,0 +1,478 @@
+
+ * Copyright (C) 2014-2016 Juanjo Menent
+ * Copyright (C) 2016 Florian Henry
+ * Copyright (C) 2015 Raphaël Doursenaud
+ *
+ * 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 32|32
* {dol_print_logo_old} Print logo stored on printer. Must be followed by logo code. For old printers.
@@ -52,6 +53,7 @@
* {dol_print_order_lines} Print order lines for Printer
* {dol_print_object_lines_with_notes} Print object lines with notes
* {dol_print_payment} Print payment method
+ * {dol_print_curr_date} Print the current date/time. Must be followed by format string.
*
* Code which can be placed everywhere
* Replaced by date AAAA-MM-DD
@@ -178,6 +180,7 @@ class dolReceiptPrinter extends Printer
'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',
'dol_open_drawer' => 'DOL_OPEN_DRAWER',
'dol_beep' => 'DOL_BEEP',
+ 'dol_beep_alternative' => 'DOL_BEEP_ALTERNATIVE',
'dol_print_text' => 'DOL_PRINT_TEXT',
'dol_print_barcode' => 'DOL_PRINT_BARCODE',
'dol_value_date' => 'DateInvoice',
@@ -189,6 +192,7 @@ class dolReceiptPrinter extends Printer
'dol_value_day_letters' => 'DOL_VALUE_DAY',
'dol_value_currentdate' => 'DOL_VALUE_CURRENTDATE',
'dol_print_payment' => 'DOL_PRINT_PAYMENT',
+ 'dol_print_curr_date' => 'DOL_PRINT_CURR_DATE',
'dol_print_logo' => 'DOL_PRINT_LOGO',
'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
'dol_value_object_id' => 'InvoiceID',
@@ -712,6 +716,10 @@ class dolReceiptPrinter extends Printer
$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
$this->printer->text($title.$spaces.str_pad(price($object->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
break;
+ case 'DOL_PRINT_CURR_DATE':
+ if (strlen($vals[$tplline]['value'])<2) $this->printer->text(date('d/m/Y H:i:s')."\n");
+ else $this->printer->text(date($vals[$tplline]['value'])."\n");
+ break;
case 'DOL_LINE_FEED':
$this->printer->feed();
break;
@@ -794,6 +802,9 @@ class dolReceiptPrinter extends Printer
case 'DOL_BEEP':
$this->printer->getPrintConnector() -> write("\x1e");
break;
+ case 'DOL_BEEP_ALTERNATIVE': //if DOL_BEEP not works
+ $this->printer->getPrintConnector() -> write(Printer::ESC . "B" . chr(4) . chr(1));
+ break;
case 'DOL_PRINT_ORDER_LINES':
foreach ($object->lines as $line) {
if ($line->special_code == $this->orderprinter) {
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 768031467bc..274b408411f 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1067,35 +1067,56 @@ class ExtraFields
$out = '';
- $out .= ' ';
- foreach ($param['options'] as $key => $val) {
- if ((string) $key == '') {
- continue;
+ if ($langfile && $val) {
+ $options[$okey] = $langs->trans($val);
+ } else {
+ $options[$okey] = $val;
+ }
}
- $valarray = explode('|', $val);
- $val = $valarray[0];
- $parent = '';
- if (!empty($valarray[1])) {
- $parent = $valarray[1];
+ $selected = array();
+ if (!is_array($value)) {
+ $selected = explode(',', $value);
}
- $out .= 'trans($val);
- } else {
- $out .= $val;
+
+ $out .= $form->multiselectarray($keyprefix.$key.$keysuffix, $options, $selected, 0, 0, $morecss, 0, 0, '', '', '', !empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2));
+ } else {
+ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
}
- $out .= ' ';
+
+ $out .= '';
+ $out .= ' ';
+ foreach ($param['options'] as $key => $val) {
+ if ((string) $key == '') {
+ continue;
+ }
+ $valarray = explode('|', $val);
+ $val = $valarray[0];
+ $parent = '';
+ if (!empty($valarray[1])) {
+ $parent = $valarray[1];
+ }
+ $out .= 'trans($val);
+ } else {
+ $out .= $val;
+ }
+ $out .= ' ';
+ }
+ $out .= ' ';
}
- $out .= ' ';
} elseif ($type == 'sellist') {
$out = '';
if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
@@ -2133,6 +2154,16 @@ class ExtraFields
} else {
continue; // Value was not provided, we should not set it.
}
+ } elseif ($key_type == 'select') {
+ // to detect if we are in search context
+ if (GETPOSTISARRAY($keysuffix."options_".$key.$keyprefix)) {
+ $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix, 'array:aZ09');
+ // Make sure we get an array even if there's only one selected
+ $value_arr = (array) $value_arr;
+ $value_key = implode(',', $value_arr);
+ } else {
+ $value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
+ }
} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
continue; // Value was not provided, we should not set it.
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 31f69878dda..143d11c41f1 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -867,17 +867,17 @@ class Form
/**
* Return combo list of activated countries, into language of user
*
- * @param string $selected Id or Code or Label of preselected country
- * @param string $htmlname Name of html select object
- * @param string $htmloption More html options on select object
- * @param integer $maxlength Max length for labels (0=no limit)
- * @param string $morecss More css class
- * @param string $usecodeaskey ''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
- * @param int $showempty Show empty choice
- * @param int $disablefavorites 1=Disable favorites,
- * @param int $addspecialentries 1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
- * @param array $exclude_country_code Array of country code (iso2) to exclude
- * @param int $hideflags Hide flags
+ * @param string $selected Id or Code or Label of preselected country
+ * @param string $htmlname Name of html select object
+ * @param string $htmloption More html options on select object
+ * @param integer $maxlength Max length for labels (0=no limit)
+ * @param string $morecss More css class
+ * @param string $usecodeaskey ''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+ * @param int|string $showempty Show empty choice
+ * @param int $disablefavorites 1=Disable favorites,
+ * @param int $addspecialentries 1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
+ * @param array $exclude_country_code Array of country code (iso2) to exclude
+ * @param int $hideflags Hide flags
* @return string HTML string with select
*/
public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array(), $hideflags = 0)
@@ -926,7 +926,11 @@ class Form
}
if ($showempty) {
- $out .= ' '."\n";
+ if (is_numeric($showempty)) {
+ $out .= ' '."\n";
+ } else {
+ $out .= ''.$langs->trans($showempty).' '."\n";
+ }
}
if ($addspecialentries) { // Add dedicated entries for groups of countries
@@ -1279,7 +1283,6 @@ class Form
// mode 1
$urloption = 'htmlname='.urlencode(str_replace('.', '_', $htmlname)).'&outjson=1&filter='.urlencode($filter).(empty($excludeids) ? '' : '&excludeids='.join(',', $excludeids)).($showtype ? '&showtype='.urlencode($showtype) : '');
- $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
$out .= '';
if (empty($hidelabel)) {
@@ -1294,6 +1297,8 @@ class Form
if ($hidelabel == 3) {
$out .= img_picto($langs->trans("Search"), 'search');
}
+
+ $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
} else {
// Immediate load of all database
$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple, $excludeids);
@@ -8431,12 +8436,13 @@ class Form
/**
* Show linked object block.
*
- * @param CommonObject $object Object we want to show links to
- * @param string $morehtmlright More html to show on right of title
- * @param array $compatibleImportElementsList Array of compatibles elements object for "import from" action
- * @return int <0 if KO, >=0 if OK
+ * @param CommonObject $object Object we want to show links to
+ * @param string $morehtmlright More html to show on right of title
+ * @param array $compatibleImportElementsList Array of compatibles elements object for "import from" action
+ * @param string $title Title
+ * @return int <0 if KO, >=0 if OK
*/
- public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
+ public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false, $title = 'RelatedObjects')
{
global $conf, $langs, $hookmanager;
global $bc, $action;
@@ -8455,7 +8461,7 @@ class Form
$nbofdifferenttypes = count($object->linkedObjects);
print '';
- print load_fiche_titre($langs->trans('RelatedObjects'), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');
+ print load_fiche_titre($langs->trans($title), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');
print '';
@@ -8526,11 +8532,6 @@ class Form
if (empty($conf->expedition->enabled)) {
continue; // Do not show if module disabled
}
- } elseif ($objecttype == 'mo') {
- $tplpath = 'mrp/mo';
- if (empty($conf->mrp->enabled)) {
- continue; // Do not show if module disabled
- }
} elseif ($objecttype == 'ficheinter') {
$tplpath = 'fichinter';
if (empty($conf->ficheinter->enabled)) {
@@ -9435,7 +9436,6 @@ class Form
if ($resql) {
// Enhance with select2
include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
- $out .= ajax_combobox($htmlname);
$out .= '
';
@@ -9477,6 +9477,8 @@ class Form
$out .= ''.$langs->trans("NoUserGroupDefined").' ';
}
$out .= ' ';
+
+ $out .= ajax_combobox($htmlname);
} else {
dol_print_error($this->db);
}
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index f976fac978d..32f2a9b1007 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -183,7 +183,7 @@ class FormCompany extends Form
if (!empty($htmlname) && $user->admin) {
print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}
- print '
';
+ print '
';
print '';
}
@@ -234,7 +234,7 @@ class FormCompany extends Form
if (!empty($htmlname) && $user->admin) {
print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
}
- print '
';
+ print '
';
print '';
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 07bd8ac5a5f..f3b42a4789e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1162,12 +1162,13 @@ class FormFile
* @param string $sortfield Sort field ('name', 'size', 'position', ...)
* @param string $sortorder Sort order ('ASC' or 'DESC')
* @param int $disablemove 1=Disable move button, 0=Position move is possible.
- * @param int $addfilterfields Add line with filters
+ * @param int $addfilterfields Add the line with filters
* @param int $disablecrop Disable crop feature on images (-1 = auto, prefer to set it explicitely to 0 or 1)
+ * @param string $moreattrondiv More attributes on the div for responsive. Example 'style="height:280px; overflow: auto;"'
* @return int <0 if KO, nb of files shown if OK
* @see list_of_autoecmfiles()
*/
- public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1)
+ public function list_of_documents($filearray, $object, $modulepart, $param = '', $forcedownload = 0, $relativepath = '', $permonobject = 1, $useinecm = 0, $textifempty = '', $maxlength = 0, $title = '', $url = '', $showrelpart = 0, $permtoeditline = -1, $upload_dir = '', $sortfield = '', $sortorder = 'ASC', $disablemove = 1, $addfilterfields = 0, $disablecrop = -1, $moreattrondiv = '')
{
// phpcs:enable
global $user, $conf, $langs, $hookmanager, $form;
@@ -1272,7 +1273,7 @@ class FormFile
print '
';
}
- print '
';
+ print '
';
print '
'."\n";
if (!empty($addfilterfields)) {
@@ -1340,7 +1341,8 @@ class FormFile
print ''."\n";
// Do we have entry into database ?
print ''."\n";
- print '';
+ print ' ';
+
// File name
print '';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 27a8c9de3eb..47bbdec0fb2 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -191,14 +191,9 @@ class FormProjets
$resql = $this->db->query($sql);
if ($resql) {
- // Use select2 selector
if (!empty($conf->use_javascript_ajax)) {
- include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
- $comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
- $out .= $comboenhancement;
$morecss .= ' minwidth100';
}
-
if (empty($option_only)) {
$out .= '';
}
@@ -284,6 +279,15 @@ class FormProjets
if (empty($option_only)) {
$out .= ' ';
}
+
+ // Use select2 selector
+ if (!empty($conf->use_javascript_ajax)) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+ $comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
+ $out .= $comboenhancement;
+ $morecss .= ' minwidth100';
+ }
+
if (empty($nooutput)) {
print $out;
return '';
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 5600f51f5e2..31a48f38cf4 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -346,7 +346,7 @@ class FormTicket
}
}
- if ($conf->knowledgemanagement->enabled) {
+ if (!empty($conf->knowledgemanagement->enabled)) {
// KM Articles
print ' ';
-
// Type
$multiselect = 0;
if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) { // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
}
- print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
- print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500');
+ print img_picto($langs->trans("ActionType"), 'square', 'class="pictofixedwidth inline-block" style="color: #ddd;"');
+ print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500 widthcentpercentminusx');
print '
';
// Assigned to user
print '';
- print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="fawidth30 inline-block"');
+ print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="pictofixedwidth inline-block"');
print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth150 maxwidth500 widthcentpercentminusxx');
print '
';
// Assigned to user group
print '';
- print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="fawidth30 inline-block"');
+ print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="pictofixedwidth inline-block"');
print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'minwidth100 maxwidth500 widthcentpercentminusxx');
print '
';
@@ -99,7 +98,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
// Resource
print '';
- print img_picto($langs->trans("Resource"), 'object_resource', 'class="fawidth30 inline-block"');
+ print img_picto($langs->trans("Resource"), 'object_resource', 'class="pictofixedwidth inline-block"');
print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
print '
';
}
@@ -107,7 +106,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
if (!empty($conf->societe->enabled) && !empty($user->rights->societe->lire)) {
print '';
- print img_picto($langs->trans("ThirdParty"), 'company', 'class="fawidth30 inline-block"');
+ print img_picto($langs->trans("ThirdParty"), 'company', 'class="pictofixedwidth inline-block"');
print $form->select_company($socid, 'search_socid', '', ' ', 0, 0, null, 0, 'minwidth100 maxwidth500');
print '
';
}
@@ -117,7 +116,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
$formproject = new FormProjets($db);
print '';
- print img_picto($langs->trans("Project"), 'project', 'class="fawidth30 inline-block"');
+ print img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth inline-block"');
print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
print '
';
}
@@ -125,7 +124,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"])) {
// Status
print '';
- print img_picto($langs->trans("Status"), 'setup', 'class="fawidth30 inline-block"');
+ print img_picto($langs->trans("Status"), 'setup', 'class="pictofixedwidth inline-block"');
$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
print '
';
}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 4e972b0be4e..f768833cd39 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -964,6 +964,69 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
return $result;
}
+/**
+ * Move a directory into another name.
+ *
+ * @param string $srcdir Source directory
+ * @param string $destdir Destination directory
+ * @param int $overwriteifexists Overwrite directory if exists (1 by default)
+ * @param int $indexdatabase Index new file into database.
+ * @param int $renamedircontent Rename contents inside srcdir.
+ *
+ * @return boolean True if OK, false if KO
+*/
+function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase = 1, $renamedircontent = 1)
+{
+
+ global $user, $db, $conf;
+ $result = false;
+
+ dol_syslog("files.lib.php::dol_move_dir srcdir=".$srcdir." destdir=".$destdir." overwritifexists=".$overwriteifexists." indexdatabase=".$indexdatabase." renamedircontent=".$renamedircontent);
+ $srcexists = dol_is_dir($srcdir);
+ $srcbasename = basename($srcdir);
+ $destexists = dol_is_dir($destdir);
+
+ if (!$srcexists) {
+ dol_syslog("files.lib.php::dol_move_dir srcdir does not exists. we ignore the move request.");
+ return false;
+ }
+
+ if ($overwriteifexists || !$destexists) {
+ $newpathofsrcdir = dol_osencode($srcdir);
+ $newpathofdestdir = dol_osencode($destdir);
+
+ $result = @rename($newpathofsrcdir, $newpathofdestdir);
+
+ if ($result && $renamedircontent) {
+ if (file_exists($newpathofdestdir)) {
+ $destbasename = basename($newpathofdestdir);
+ $files = dol_dir_list($newpathofdestdir);
+ if (!empty($files) && is_array($files)) {
+ foreach ($files as $key => $file) {
+ if (!file_exists($file["fullname"])) continue;
+ $filepath = $file["path"];
+ $oldname = $file["name"];
+
+ $newname = str_replace($srcbasename, $destbasename, $oldname);
+ if (!empty($newname) && $newname !== $oldname) {
+ if ($file["type"] == "dir") {
+ $res = dol_move_dir($filepath.'/'.$oldname, $filepath.'/'.$newname, $overwriteifexists, $indexdatabase, $renamedircontent);
+ } else {
+ $res = dol_move($filepath.'/'.$oldname, $filepath.'/'.$newname);
+ }
+ if (!$res) {
+ return $result;
+ }
+ }
+ }
+ $result = true;
+ }
+ }
+ }
+ }
+ return $result;
+}
+
/**
* Unescape a file submitted by upload.
* PHP escape char " (%22) or char ' (%27) into $FILES.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index b400a4e7c1b..978d385fcda 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -370,6 +370,32 @@ function GETPOSTISSET($paramname)
return $isset;
}
+/**
+ * Return true if the parameter $paramname is submit from a POST OR GET as an array.
+ * Can be used before GETPOST to know if the $check param of GETPOST need to check an array or a string
+ *
+ * @param string $paramname Name or parameter to test
+ * @param int $method Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)
+ * @return bool True if we have just submit a POST or GET request with the parameter provided (even if param is empty)
+ */
+function GETPOSTISARRAY($paramname, $method = 0)
+{
+ // for $method test need return the same $val as GETPOST
+ if (empty($method)) {
+ $val = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+ } elseif ($method == 1) {
+ $val = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+ } elseif ($method == 2) {
+ $val = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+ } elseif ($method == 3) {
+ $val = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+ } else {
+ $val = 'BadFirstParameterForGETPOST';
+ }
+
+ return is_array($val);
+}
+
/**
* Return value of a param into GET or POST supervariable.
* Use the property $user->default_values[path]['createform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
@@ -660,11 +686,11 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
$tmpcheck = 'alphanohtml';
}
foreach ($out as $outkey => $outval) {
- $out[$outkey] = checkVal($outval, $tmpcheck, $filter, $options);
+ $out[$outkey] = sanitizeVal($outval, $tmpcheck, $filter, $options);
}
}
} else {
- $out = checkVal($out, $check, $filter, $options);
+ $out = sanitizeVal($out, $check, $filter, $options);
}
// Sanitizing for special parameters.
@@ -713,9 +739,11 @@ function GETPOSTINT($paramname, $method = 0)
return (int) GETPOST($paramname, 'int', $method, null, null, 0);
}
+
/**
- * Return a value after checking on a rule. A sanitization may also have been done.
+ * Return a sanitized or empty value after checking value against a rule.
*
+ * @deprecated
* @param string|array $out Value to check/clear.
* @param string $check Type of check/sanitizing
* @param int $filter Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
@@ -723,9 +751,24 @@ function GETPOSTINT($paramname, $method = 0)
* @return string|array Value sanitized (string or array). It may be '' if format check fails.
*/
function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
+{
+ return sanitizeVal($out, $check, $filter, $options);
+}
+
+/**
+ * Return a sanitized or empty value after checking value against a rule.
+ *
+ * @param string|array $out Value to check/clear.
+ * @param string $check Type of check/sanitizing
+ * @param int $filter Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
+ * @param mixed $options Options to pass to filter_var when $check is set to 'custom'
+ * @return string|array Value sanitized (string or array). It may be '' if format check fails.
+ */
+function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
{
global $conf;
+ // TODO : use class "Validate" to perform tests (and add missing tests) if needed for factorize
// Check is done after replacement
switch ($check) {
case 'none':
@@ -2115,9 +2158,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$morehtmlstatus .= ''.$object->getLibStatut(6, 1).' ';
}
} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan', 'tva', 'salary'))) {
- $tmptxt = $object->getLibStatut(6, $object->totalpaye);
+ $tmptxt = $object->getLibStatut(6, $object->totalpaid);
if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
- $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+ $tmptxt = $object->getLibStatut(5, $object->totalpaid);
}
$morehtmlstatus .= $tmptxt;
} elseif ($object->element == 'contrat' || $object->element == 'contract') {
@@ -2261,7 +2304,7 @@ function dol_bc($var, $moreclass = '')
*/
function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0, $extralangcode = '')
{
- global $conf, $langs;
+ global $conf, $langs, $hookmanager;
$ret = '';
$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR', 'CN'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
@@ -2328,6 +2371,14 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
$langs->load("dict");
$ret .= (empty($object->country_code) ? '' : ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)));
}
+ if ($hookmanager) {
+ $parameters = array('withcountry' => $withcountry, 'sep' => $sep, 'outputlangs' => $outputlangs,'mode' => $mode, 'extralangcode' => $extralangcode);
+ $reshook = $hookmanager->executeHooks('formatAddress', $parameters, $object);
+ if ($reshook > 0) {
+ $ret = '';
+ }
+ $ret .= $hookmanager->resPrint;
+ }
return $ret;
}
@@ -2453,6 +2504,9 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
} elseif ($format == 'dayhourlog') {
// Format not sensitive to language
$format = '%Y%m%d%H%M%S';
+ } elseif ($format == 'dayhourlogsmall') {
+ // Format not sensitive to language
+ $format = '%Y%m%d%H%M';
} elseif ($format == 'dayhourldap') {
$format = '%Y%m%d%H%M%SZ';
} elseif ($format == 'dayhourxcard') {
@@ -3714,6 +3768,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '', $marginleftonlyshort = 2)
{
global $conf, $langs;
+
// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
$url = DOL_URL_ROOT;
$theme = isset($conf->theme) ? $conf->theme : null;
@@ -3732,15 +3787,25 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
}
} else {
$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
+ $pictowithouttext = str_replace('object_', '', $pictowithouttext);
- if (strpos($pictowithouttext, 'fontawesome_') !== false) {
- $pictowithouttext = explode('_', $pictowithouttext);
+ if (strpos($pictowithouttext, 'fontawesome_') !== false || preg_match('/^fa-/', $pictowithouttext)) {
+ // This is a font awesome image 'fonwtawesome_xxx' or 'fa-xxx'
+ $pictowithouttext = str_replace('fa-', '', $pictowithouttext);
+ $pictowithouttextarray = explode('_', $pictowithouttext);
$marginleftonlyshort = 0;
- $fakey = 'fa-'.$pictowithouttext[1];
- $fa = $pictowithouttext[2] ? $pictowithouttext[2] : 'fa';
- $facolor = $pictowithouttext[3] ? $pictowithouttext[3] : '';
- $fasize = $pictowithouttext[4] ? $pictowithouttext[4] : '';
+ if (!empty($pictowithouttextarray[1])) {
+ $fakey = 'fa-'.$pictowithouttextarray[1];
+ $fa = empty($pictowithouttextarray[2]) ? 'fa' : $pictowithouttextarray[2];
+ $facolor = empty($pictowithouttextarray[3]) ? '' : $pictowithouttextarray[3];
+ $fasize = empty($pictowithouttextarray[4]) ? '' : $pictowithouttextarray[4];
+ } else {
+ $fakey = 'fa-'.$pictowithouttext;
+ $fa = 'fa';
+ $facolor = '';
+ $fasize = '';
+ }
// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
@@ -3766,7 +3831,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
return $enabledisablehtml;
}
- $pictowithouttext = str_replace('object_', '', $pictowithouttext);
if (empty($srconly) && in_array($pictowithouttext, array(
'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
@@ -4904,10 +4968,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
$liste_titre = 'liste_titre_sel';
}
- $out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
+ $tagstart = '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
//$out .= (($field && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && preg_match('/^[a-zA-Z_0-9\s\.\-:&;]*$/', $name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '');
- $out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
- $out .= '>';
+ $tagstart .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
+ $tagstart .= '>';
if (empty($thead) && $field && empty($disablesortlink)) { // If this is a sort field
$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
@@ -4921,12 +4985,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if ($field1 != $sortfield1) { // We are on another field than current sorted field
if (preg_match('/^DESC/i', $sortorder)) {
$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
- } else // We reverse the var $sortordertouseinlink
- {
+ } else { // We reverse the var $sortordertouseinlink
$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
}
- } else // We are on field that is the first current sorting criteria
- {
+ } else { // We are on field that is the first current sorting criteria
if (preg_match('/^ASC/i', $sortorder)) { // We reverse the var $sortordertouseinlink
$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
} else {
@@ -4965,19 +5027,19 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
if (preg_match('/^DESC/', $sortorder)) {
//$out.= ''.img_down("A-Z",0).' ';
//$out.= ''.img_up("Z-A",1).' ';
- $sortimg .= ''.img_up("Z-A", 0, 'paddingleft').' ';
+ $sortimg .= ''.img_up("Z-A", 0, 'paddingright').' ';
}
if (preg_match('/^ASC/', $sortorder)) {
//$out.= ''.img_down("A-Z",1).' ';
//$out.= ''.img_up("Z-A",0).' ';
- $sortimg .= ''.img_down("A-Z", 0, 'paddingleft').' ';
+ $sortimg .= ''.img_down("A-Z", 0, 'paddingright').' ';
}
}
}
- $out .= $sortimg;
+ $tagend = '';
- $out .= '';
+ $out = $tagstart.$sortimg.$out.$tagend;
return $out;
}
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 7c24d17d61e..786483e257b 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -245,246 +245,6 @@ function supplier_invoice_rec_prepare_head($object)
return $head;
}
-/**
- * Return a HTML table that contains a pie chart of customer invoices
- *
- * @param int $socid (Optional) Show only results from the customer with this id
- * @return string A HTML table that contains a pie chart of customer invoices
- */
-function getCustomerInvoicePieChart($socid = 0)
-{
- global $conf, $db, $langs, $user;
-
- if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) {
- return '';
- }
-
- $sql = "SELECT count(f.rowid), f.fk_statut";
- $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
- $sql .= ", ".MAIN_DB_PREFIX."facture as f";
- if (empty($user->rights->societe->client->voir) && !$socid) {
- $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
- }
- $sql .= " WHERE f.fk_soc = s.rowid";
- $sql .= " AND f.entity IN (".getEntity('facture').")";
- if ($user->socid) {
- $sql .= ' AND f.fk_soc = '.((int) $user->socid);
- }
- if (empty($user->rights->societe->client->voir) && !$socid) {
- $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
- }
- $sql .= " GROUP BY f.fk_statut";
-
- $resql = $db->query($sql);
- if (!$resql) {
- dol_print_error($db);
- return '';
- }
-
- $num = $db->num_rows($resql);
- $i = 0;
-
- $total = 0;
- $vals = array();
-
- while ($i < $num) {
- $row = $db->fetch_row($resql);
- if ($row) {
- $vals[$row[1]] = $row[0];
- $total += $row[0];
- }
-
- $i++;
- }
-
- $db->free($resql);
-
- include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-
- $result = '';
- $result .= '
';
- $result .= '';
- $result .= ''.$langs->trans("Statistics").' - '.$langs->trans("CustomerInvoice").' ';
- $result .= ' ';
-
- $objectstatic = new Facture($db);
- $array = array(Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED, Facture::STATUS_ABANDONED);
- $dataseries = array();
-
- foreach ($array as $status) {
- $objectstatic->statut = $status;
- $objectstatic->paye = $status == Facture::STATUS_CLOSED ? -1 : 0;
-
- $dataseries[] = array($objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
- if ($status == Facture::STATUS_DRAFT) {
- $colorseries[$status] = '-'.$badgeStatus0;
- }
- if ($status == Facture::STATUS_VALIDATED) {
- $colorseries[$status] = $badgeStatus1;
- }
- if ($status == Facture::STATUS_CLOSED) {
- $colorseries[$status] = $badgeStatus9;
- }
- if ($status == Facture::STATUS_ABANDONED) {
- $colorseries[$status] = $badgeStatus6;
- }
-
- if (!$conf->use_javascript_ajax) {
- $result .= '';
- $result .= ''.$objectstatic->getLibStatut(0).' ';
- $result .= ''.(isset($vals[$status]) ? $vals[$status] : 0).' ';
- }
- }
-
- if ($conf->use_javascript_ajax) {
- $dolgraph = new DolGraph();
- $dolgraph->SetData($dataseries);
- $dolgraph->SetDataColor(array_values($colorseries));
- $dolgraph->setShowLegend(2);
- $dolgraph->setShowPercent(1);
- $dolgraph->SetType(['pie']);
- $dolgraph->setHeight('150');
- $dolgraph->setWidth('300');
- $dolgraph->draw('idgraphcustomerinvoices');
-
- $result .= '';
- $result .= ''.$dolgraph->show($total ? 0 : 1).' ';
- $result .= ' ';
- }
-
- $result .= '';
- $result .= ''.$langs->trans("Total").' ';
- $result .= ''.$total.' ';
- $result .= ' ';
-
- $result .= '
';
- $result .= '
';
- $result .= '
';
-
- $result .= '';
- $result .= ''.$langs->trans("Statistics").' - '.$langs->trans("SupplierInvoice").' ';
- $result .= ' ';
-
- $objectstatic = new FactureFournisseur($db);
- $array = array(FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_CLOSED, FactureFournisseur::STATUS_ABANDONED);
- $dataseries = array();
-
- foreach ($array as $status) {
- $objectstatic->statut = $status;
- $objectstatic->paye = $status == FactureFournisseur::STATUS_CLOSED ? -1 : 0;
-
- $dataseries[] = array($objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
- if ($status == FactureFournisseur::STATUS_DRAFT) {
- $colorseries[$status] = '-'.$badgeStatus0;
- }
- if ($status == FactureFournisseur::STATUS_VALIDATED) {
- $colorseries[$status] = $badgeStatus1;
- }
- if ($status == FactureFournisseur::STATUS_CLOSED) {
- $colorseries[$status] = $badgeStatus9;
- }
- if ($status == FactureFournisseur::STATUS_ABANDONED) {
- $colorseries[$status] = $badgeStatus6;
- }
-
- if (!$conf->use_javascript_ajax) {
- $result .= '';
- $result .= ''.$objectstatic->getLibStatut(0).' ';
- $result .= ''.(isset($vals[$status]) ? $vals[$status] : 0).' ';
- }
- }
-
- if ($conf->use_javascript_ajax) {
- $dolgraph = new DolGraph();
- $dolgraph->SetData($dataseries);
- $dolgraph->SetDataColor(array_values($colorseries));
- $dolgraph->setShowLegend(2);
- $dolgraph->setShowPercent(1);
- $dolgraph->SetType(['pie']);
- $dolgraph->setHeight('150');
- $dolgraph->setWidth('300');
- $dolgraph->draw('idgraphpurchaseinvoices');
-
- $result .= '';
- $result .= ''.$dolgraph->show($total ? 0 : 1).' ';
- $result .= ' ';
- }
-
- $result .= '';
- $result .= ''.$langs->trans("Total").' ';
- $result .= ''.$total.' ';
- $result .= ' ';
-
- $result .= '
';
- $result .= '
'.$langs->trans("EnableShowLogo").' ';
- if ($edit) {
- print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
- //print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
- } else {
- print yn($conf->global->MAIN_SHOW_LOGO);
- }
- print ' ';
- print ''.$langs->trans("EnableShowLogo").' ' . yn($conf->global->MAIN_SHOW_LOGO) . ' ';
- print "';
print ''.$langs->trans("TopMenuDisableImages").' ';
print '';
if ($edit) {
- print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
- //print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+ //print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
+ print $form->selectarray('THEME_TOPMENU_DISABLE_IMAGE', $listoftopmenumodes, $conf->global->THEME_TOPMENU_DISABLE_IMAGE);
} else {
- print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+ $listoftopmenumodes[$conf->global->THEME_TOPMENU_DISABLE_IMAGE];
+ //print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
}
- print ' '.$langs->trans("Default").' : '.$default.' ';
- print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));
print ' ';
print ' ';
}
+ // Show logo
+ if ($foruserprofile) {
+ // Nothing
+ } else {
+ // Show logo
+ print ''.$langs->trans("EnableShowLogo").' ';
+ if ($edit) {
+ print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
+ //print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
+ } else {
+ print yn($conf->global->MAIN_SHOW_LOGO);
+ }
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));
+ print ' ';
+ print ''.$langs->trans("EnableShowLogo").' ' . yn($conf->global->MAIN_SHOW_LOGO) . ' ';
+ print "';
print ''.$langs->trans("UseBorderOnTable").' ';
print '';
@@ -522,8 +527,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
} else {
print yn($conf->global->THEME_ELDY_USEBORDERONTABLE);
}
- print ' '.$langs->trans("Default").' : '.$default.' ';
- print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));
print ' ';
print ' ';
}
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 9a91aa58ac1..9270b946199 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -365,9 +365,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled', __HANDLER__, 'left', 3000__+MAX_llx_menu__, 'accountancy', 'asset', 9__+MAX_llx_menu__, '/asset/list.php?mainmenu=accountancy&leftmenu=asset', 'MenuAssets', 1, 'assets', '$user->rights->asset->read', '', 0, 20, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3001__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/card.php?mainmenu=accountancy&leftmenu=asset&action=create', 'MenuNewAsset', 2, 'assets', '$user->rights->asset->write', '', 0, 21, __ENTITY__);
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3003__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/list.php?mainmenu=accountancy&leftmenu=asset', 'MenuListAssets', 2, 'assets', '$user->rights->asset->read', '', 0, 22, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3004__+MAX_llx_menu__, 'asset', 'asset_type', 3000__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&leftmenu=asset', 'MenuTypeAssets', 2, 'assets', '$user->rights->asset->read', '', 0, 23, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3005__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&action=create', 'MenuNewTypeAssets', 3, 'assets', '$user->rights->asset->setup_advance', '', 0, 24, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3006__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy', 'MenuListTypeAssets', 3, 'assets', '$user->rights->asset->read', '', 0, 25, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3004__+MAX_llx_menu__, 'asset', 'asset_type', 3000__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&leftmenu=asset', 'MenuTypeAssets', 2, 'assets', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->asset->model_advance->read:$user->rights->asset->read)', '', 0, 23, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3005__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&action=create', 'MenuNewTypeAssets', 3, 'assets', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->asset->model_advance->write:$user->rights->asset->write)', '', 0, 24, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3006__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy', 'MenuListTypeAssets', 3, 'assets', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->asset->model_advance->read:$user->rights->asset->read)', '', 0, 25, __ENTITY__);
-- Check deposit
insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?mainmenu=bank&leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 556ee3e609a..ea6d21fe457 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -339,7 +339,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid ? 1 : 0), 'auguria', $tabMenu);
// We update newmenu for special dynamic menus
- if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') { // Entry for each bank account
+ if (!empty($conf->banque->enabled) && $user->rights->banque->lire && $mainmenu == 'bank') { // Entry for each bank account
include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
$sql = "SELECT rowid, label, courant, rappro, courant";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index d48402ab0fb..b3788d776a0 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -807,7 +807,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
if ($mainmenu == 'hrm') {
get_left_menu_hrm($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
}
-
/*
* Menu TOOLS
*/
@@ -1879,10 +1878,10 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
$newmenu->add("/asset/list.php?leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset', 100, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
$newmenu->add("/asset/card.php?leftmenu=asset&action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);
$newmenu->add("/asset/list.php?leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
- $newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->read)), '', $mainmenu, 'asset_model');
+ $newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)), '', $mainmenu, 'asset_model');
if ($usemenuhider || empty($leftmenu) || preg_match('/asset_model/', $leftmenu)) {
- $newmenu->add("/asset/model/card.php?leftmenu=asset_model&action=create", $langs->trans("MenuNewAssetModel"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->write)));
- $newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->setup_advance->read)));
+ $newmenu->add("/asset/model/card.php?leftmenu=asset_model&action=create", $langs->trans("MenuNewAssetModel"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write)));
+ $newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuListAssetModels"), 2, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
}
}
}
@@ -2262,19 +2261,19 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
// Load translation files required by the page
$langs->loadLangs(array("holiday", "trips"));
- $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'holiday', 'class="pictofixedwidth"'));
- $newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write);
- $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);
- if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {
- $newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
- $newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
- $newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
- $newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
- $newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
+ $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="pictofixedwidth"'));
+ $newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write, '', $mainmenu);
+ $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->rights->holiday->read, '', $mainmenu);
+ if ($usemenuhider || empty($leftmenu) || $leftmenu == "holiday") {
+ $newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+ $newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=holiday", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+ $newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=holiday", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+ $newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=holiday", $langs->trans("CancelCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+ $newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=holiday", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
}
- $newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);
- $newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall);
- $newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);
+ $newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+ $newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm');
+ $newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday, '', $mainmenu, 'holiday_sm');
}
// Trips and expenses (old module)
@@ -2316,6 +2315,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
}
}
+
/**
* Get left Menu TOOLS
*
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index b579c9b0059..80ed0b345ba 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -1465,6 +1465,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
if ($command) {
$sql .= " AND command = '".$this->db->escape($command)."'";
}
+ if ($parameters) {
+ $sql .= " AND params = '".$this->db->escape($parameters)."'";
+ }
$sql .= " AND entity = ".((int) $entity); // Must be exact entity
$now = dol_now();
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 3626b36d7e3..2b4ec29c880 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -133,7 +133,7 @@ class CommActionRapport
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
$dir = $conf->agenda->dir_temp."/";
- $file = $dir."actions-".$this->month."-".$this->year.".pdf";
+ $file = $dir."actions-".sprintf("%02d", $this->month)."-".sprintf("%04d", $this->year).".pdf";
if (!file_exists($dir)) {
if (dol_mkdir($dir) < 0) {
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 56ae5f5af7e..bdda6f26862 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -163,6 +163,7 @@ class pdf_einstein extends ModelePDFCommandes
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+ $this->watermark = '';
// Get source company
$this->emetteur = $mysoc;
@@ -235,6 +236,11 @@ class pdf_einstein extends ModelePDFCommandes
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
+ // Show Draft Watermark
+ if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
+ $this->watermark = $conf->global->COMMANDE_DRAFT_WATERMARK;
+ }
+
global $outputlangsbis;
$outputlangsbis = null;
if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -1284,11 +1290,6 @@ class pdf_einstein extends ModelePDFCommandes
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
- // Show Draft Watermark
- if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
- pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
- }
-
$pdf->SetTextColor(0, 0, 60);
$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1533,6 +1534,6 @@ class pdf_einstein extends ModelePDFCommandes
// phpcs:enable
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
- return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+ return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
}
}
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 1a7e28d3bd4..212d324acaf 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -168,6 +168,7 @@ class pdf_eratosthene extends ModelePDFCommandes
$this->option_credit_note = 0; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+ $this->watermark = '';
// Get source company
$this->emetteur = $mysoc;
@@ -219,6 +220,11 @@ class pdf_eratosthene extends ModelePDFCommandes
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
+ // Show Draft Watermark
+ if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
+ $this->watermark = $conf->global->COMMANDE_DRAFT_WATERMARK;
+ }
+
global $outputlangsbis;
$outputlangsbis = null;
if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -1451,11 +1457,6 @@ class pdf_eratosthene extends ModelePDFCommandes
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
- // Show Draft Watermark
- if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
- pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
- }
-
$pdf->SetTextColor(0, 0, 60);
$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1718,7 +1719,7 @@ class pdf_eratosthene extends ModelePDFCommandes
// phpcs:enable
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
- return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+ return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
}
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index a038705ea22..982a63dade8 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -140,6 +140,8 @@ class pdf_espadon extends ModelePdfExpedition
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
$this->option_logo = 1; // Display logo
+ $this->option_draft_watermark = 1; // Support add of a watermark on drafts
+ $this->watermark = '';
// Get source company
$this->emetteur = $mysoc;
@@ -180,6 +182,11 @@ class pdf_espadon extends ModelePdfExpedition
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
+ // Show Draft Watermark
+ if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
+ $this->watermark = $conf->global->SHIPPING_DRAFT_WATERMARK;
+ }
+
global $outputlangsbis;
$outputlangsbis = null;
if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -947,11 +954,6 @@ class pdf_espadon extends ModelePdfExpedition
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
- // Show Draft Watermark
- if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
- pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
- }
-
//Prepare next
$pdf->SetTextColor(0, 0, 60);
$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1186,7 +1188,7 @@ class pdf_espadon extends ModelePdfExpedition
{
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
- return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+ return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
}
/**
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 64d8a2c65e6..e1da387d1ad 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -141,6 +141,8 @@ class pdf_rouget extends ModelePdfExpedition
$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
$this->option_logo = 1; // Display logo
+ $this->option_draft_watermark = 1; // Support add of a watermark on drafts
+ $this->watermark = '';
// Get source company
$this->emetteur = $mysoc;
@@ -214,6 +216,11 @@ class pdf_rouget extends ModelePdfExpedition
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch", "other"));
+ // Show Draft Watermark
+ if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
+ $this->watermark = $conf->global->SHIPPING_DRAFT_WATERMARK;
+ }
+
$nblines = count($object->lines);
// Loop on each lines to detect if there is at least one image to show
@@ -892,11 +899,6 @@ class pdf_rouget extends ModelePdfExpedition
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
- // Show Draft Watermark
- if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
- pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
- }
-
//Prepare la suite
$pdf->SetTextColor(0, 0, 60);
$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -1131,6 +1133,6 @@ class pdf_rouget extends ModelePdfExpedition
{
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
- return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+ return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
}
}
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 55f96b489e1..1bb5400acc7 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -169,6 +169,7 @@ class pdf_crabe extends ModelePDFFactures
$this->option_credit_note = 1; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+ $this->watermark = '';
// Get source company
$this->emetteur = $mysoc;
@@ -248,6 +249,11 @@ class pdf_crabe extends ModelePDFFactures
// Load translation files required by the page
$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+ // Show Draft Watermark
+ if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
+ $this->watermark = $conf->global->FACTURE_DRAFT_WATERMARK;
+ }
+
global $outputlangsbis;
$outputlangsbis = null;
if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -1717,11 +1723,6 @@ class pdf_crabe extends ModelePDFFactures
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
- // Show Draft Watermark
- if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
- pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
- }
-
$pdf->SetTextColor(0, 0, 60);
$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -2047,6 +2048,6 @@ class pdf_crabe extends ModelePDFFactures
{
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
- return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+ return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
}
}
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 70c02ade03e..bc4dad25f91 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -170,6 +170,7 @@ class pdf_sponge extends ModelePDFFactures
$this->option_credit_note = 1; // Support credit notes
$this->option_freetext = 1; // Support add of a personalised text
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+ $this->watermark = '';
// Get source company
$this->emetteur = $mysoc;
@@ -233,6 +234,11 @@ class pdf_sponge extends ModelePDFFactures
$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
}
+ // Show Draft Watermark
+ if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
+ $this->watermark = $conf->global->FACTURE_DRAFT_WATERMARK;
+ }
+
$nblines = count($object->lines);
$hidetop = 0;
@@ -1943,11 +1949,6 @@ class pdf_sponge extends ModelePDFFactures
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
- // Show Draft Watermark
- if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
- pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
- }
-
$pdf->SetTextColor(0, 0, 60);
$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -2273,7 +2274,7 @@ class pdf_sponge extends ModelePDFFactures
{
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
- return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+ return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
}
/**
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 29d0cc8cac4..8c07dbb64f3 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -148,6 +148,7 @@ class pdf_soleil extends ModelePDFFicheinter
$this->option_condreg = 0; // Display payment terms
$this->option_multilang = 1; // Available in several languages
$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+ $this->watermark = '';
// Get source company
$this->emetteur = $mysoc;
@@ -187,6 +188,11 @@ class pdf_soleil extends ModelePDFFicheinter
// Load traductions files required by page
$outputlangs->loadLangs(array("main", "interventions", "dict", "companies"));
+ // Show Draft Watermark
+ if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FICHINTER_DRAFT_WATERMARK))) {
+ $this->watermark = $conf->global->FICHINTER_DRAFT_WATERMARK;
+ }
+
if ($conf->ficheinter->dir_output) {
$object->fetch_thirdparty();
@@ -560,11 +566,6 @@ class pdf_soleil extends ModelePDFFicheinter
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
- //Affiche le filigrane brouillon - Print Draft Watermark
- if ($object->statut == 0 && (!empty($conf->global->FICHINTER_DRAFT_WATERMARK))) {
- pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FICHINTER_DRAFT_WATERMARK);
- }
-
//Prepare next
$pdf->SetTextColor(0, 0, 60);
$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -739,6 +740,6 @@ class pdf_soleil extends ModelePDFFicheinter
{
global $conf;
$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
- return pdf_pagefoot($pdf, $outputlangs, 'FICHINTER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+ return pdf_pagefoot($pdf, $outputlangs, 'FICHINTER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
}
}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 0000189c998..08eb9a6f42d 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -393,6 +393,9 @@ class ImportCsv extends ModeleImports
$newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
}
+ //var_dump($newval);var_dump($val);
+ //var_dump($objimport->array_import_convertvalue[0][$val]);
+
// Make some tests on $newval
// Is it a required field ?
@@ -417,7 +420,7 @@ class ImportCsv extends ModeleImports
}
$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
- //print 'Val is now '.$newval.' and is type '.$isidorref."
+ * Copyright (C) 2011-2022 Laurent Destailleur
*
* 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
@@ -18,7 +18,7 @@
// Need global variable $urllogo, $title and $titletruedolibarrversion to be defined by caller (like dol_loginfunction in security2.lib.php)
// Caller can also set $morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);
-
+// $titletruedolibarrversion must be defined
if (!defined('NOBROWSERNOTIF')) {
define('NOBROWSERNOTIF', 1);
@@ -71,6 +71,12 @@ $php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmlt
if (!preg_match('/mainmenu=/', $php_self)) {
$php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';
}
+if (preg_match('/'.preg_quote('core/modules/oauth', '/').'/', $php_self)) {
+ $php_self = DOL_URL_ROOT.'/index.php?mainmenu=home';
+}
+$php_self = preg_replace('/(\?|&|&)action=[^&]+/', '\1', $php_self);
+$php_self = preg_replace('/(\?|&|&)massaction=[^&]+/', '\1', $php_self);
+$php_self = preg_replace('/(\?|&|&)token=[^&]+/', '\1', $php_self);
// Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second
$arrayofjs = array(
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index dfac4c5b84d..54ee9929cb2 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -202,8 +202,8 @@ class InterfaceStripe extends DolibarrTriggers
$this->db->query($sql);
}
- // If payment mode is linked to Stripee, we update/delete Stripe too
- if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
+ // If payment mode is linked to Stripe, we update/delete Stripe too
+ if ($action == 'COMPANYPAYMENTMODE_CREATE' && $object->type == 'card') {
// For creation of credit card, we do not create in Stripe automatically
}
if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
@@ -222,6 +222,7 @@ class InterfaceStripe extends DolibarrTriggers
}
if ($customer) {
+ dol_syslog("We got the customer, so now we update the credit card", LOG_DEBUG);
$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
if ($card) {
$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 508db07c65e..19a3577d5f1 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -901,9 +901,17 @@ class EmailCollector extends CommonObject
// Overwrite param $tmpproperty
$valueextracted = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
if (strtolower($sourcefield) == 'header') {
- $object->$tmpproperty = $this->decodeSMTPSubject($valueextracted);
+ if (preg_match('/^options_/', $tmpproperty)) {
+ $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $this->decodeSMTPSubject($valueextracted);
+ } else {
+ $object->$tmpproperty = $this->decodeSMTPSubject($valueextracted);
+ }
} else {
- $object->$tmpproperty = $valueextracted;
+ if (preg_match('/^options_/', $tmpproperty)) {
+ $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $this->decodeSMTPSubject($valueextracted);
+ } else {
+ $object->$tmpproperty = $this->decodeSMTPSubject($valueextracted);
+ }
}
} else {
// Regex not found
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 402fbdc04d1..357683ef35a 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -279,8 +279,8 @@ class Shipments extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->shipment->addline(
$request_data->desc,
@@ -347,8 +347,8 @@ class Shipments extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->shipment->updateline(
$lineid,
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index acb54dde6f3..9035413b533 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2069,69 +2069,6 @@ class Expedition extends CommonObject
}
}
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Update/create delivery method.
- *
- * @param string $id id method to activate
- *
- * @return void
- */
- public function update_delivery_method($id = '')
- {
- // phpcs:enable
- if ($id == '') {
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
- $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
- $resql = $this->db->query($sql);
- } else {
- $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
- $sql .= " code='".$this->db->escape($this->update['code'])."'";
- $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
- $sql .= ",description='".$this->db->escape($this->update['description'])."'";
- $sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
- $sql .= " WHERE rowid=".((int) $id);
- $resql = $this->db->query($sql);
- }
- if ($resql < 0) {
- dol_print_error($this->db, '');
- }
- }
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * Activate delivery method.
- *
- * @param int $id id method to activate
- * @return void
- */
- public function activ_delivery_method($id)
- {
- // phpcs:enable
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
- $sql .= " WHERE rowid = ".((int) $id);
-
- $resql = $this->db->query($sql);
- }
-
- // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
- /**
- * DesActivate delivery method.
- *
- * @param int $id id method to desactivate
- *
- * @return void
- */
- public function disable_delivery_method($id)
- {
- // phpcs:enable
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
- $sql .= " WHERE rowid= ".((int) $id);
-
- $resql = $this->db->query($sql);
- }
-
-
/**
* Forge an set tracking url
*
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 37319a3ec71..876b08f18f0 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -251,8 +251,8 @@ class ExpenseReports extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->expensereport->addline(
$request_data->desc,
@@ -319,8 +319,8 @@ class ExpenseReports extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->desc = checkVal($request_data->desc, 'restricthtml');
- $request_data->label = checkVal($request_data->label);
+ $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+ $request_data->label = sanitizeVal($request_data->label);
$updateRes = $this->expensereport->updateline(
$lineid,
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 1ed0e7a30f5..9a69784adce 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -112,6 +112,9 @@ class ExpenseReport extends CommonObject
public $fk_user_validator; // User that is defined to approve
// Validation
+ /* @deprecated */
+ public $datevalid;
+
public $date_valid; // User making validation
public $fk_user_valid;
public $user_valid_infos;
@@ -1806,8 +1809,6 @@ class ExpenseReport extends CommonObject
// We don't know seller and buyer for expense reports
$seller = $mysoc; // We use same than current company (expense report are often done in same country)
$seller->tva_assuj = 1; // Most seller uses vat
- $seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
- $seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
$buyer = new Societe($this->db);
$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -1891,10 +1892,7 @@ class ExpenseReport extends CommonObject
if (!is_object($seller)) {
$seller = $mysoc; // We use same than current company (expense report are often done in same country)
$seller->tva_assuj = 1; // Most seller uses vat
- $seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
- $seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
}
- //$buyer = new Societe($this->db);
$expensereportrule = new ExpenseReportRule($db);
$rulestocheck = $expensereportrule->getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author);
@@ -1979,10 +1977,7 @@ class ExpenseReport extends CommonObject
if (!is_object($seller)) {
$seller = $mysoc; // We use same than current company (expense report are often done in same country)
$seller->tva_assuj = 1; // Most seller uses vat
- $seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
- $seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
}
- //$buyer = new Societe($this->db);
$expenseik = new ExpenseReportIk($this->db);
$range = $expenseik->getRangeByUser($userauthor, $this->line->fk_c_exp_tax_cat);
@@ -2618,9 +2613,11 @@ class ExpenseReportLine extends CommonObjectLine
public $projet_ref;
public $projet_title;
+ public $rang;
public $vatrate;
public $vat_src_code;
+ public $tva_tx;
public $localtax1_tx;
public $localtax2_tx;
public $localtax1_type;
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index f25192578be..883ba7ea11e 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -302,7 +302,7 @@ class Export
public function build_filterQuery($TypeField, $NameField, $ValueField)
{
// phpcs:enable
- $NameField = checkVal($NameField, 'aZ09');
+ $NameField = sanitizeVal($NameField, 'aZ09');
$szFilterQuery = '';
//print $TypeField." ".$NameField." ".$ValueField;
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index eeb5261ef19..edbffca0df5 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -5,7 +5,7 @@
* Copyright (C) 2011-2020 Juanjo Menent
* Copyright (C) 2013 Florian Henry
* Copyright (C) 2014-2018 Ferran Marcet
- * Copyright (C) 2014-2018 Charlene Benke
+ * Copyright (C) 2014-2022 Charlene Benke
* Copyright (C) 2015-2016 Abbes Bahfir
* Copyright (C) 2018 Philippe Grand
* Copyright (C) 2020 Frédéric France
@@ -65,6 +65,7 @@ $mesg = GETPOST('msg', 'alpha');
$origin = GETPOST('origin', 'alpha');
$originid = (GETPOST('originid', 'int') ?GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
$note_public = GETPOST('note_public', 'restricthtml');
+$note_private = GETPOST('note_private', 'restricthtml');
$lineid = GETPOST('line_id', 'int');
$error = 0;
@@ -79,6 +80,7 @@ $hookmanager->initHooks(array('interventioncard', 'globalcard'));
$object = new Fichinter($db);
$extrafields = new ExtraFields($db);
+$objectsrc = null;
$extrafields->fetch_name_optionals_label($object->table_element);
@@ -776,7 +778,7 @@ if (empty($reshook)) {
$form = new Form($db);
$formfile = new FormFile($db);
-if ($conf->contrat->enabled) {
+if (!empty($conf->contrat->enabled)) {
$formcontract = new FormContract($db);
}
if (!empty($conf->projet->enabled)) {
@@ -1227,7 +1229,7 @@ if ($action == 'create') {
print '';
// Contract
- if ($conf->contrat->enabled) {
+ if (!empty($conf->contrat->enabled)) {
$langs->load('contracts');
print '';
print '';
@@ -1510,7 +1512,7 @@ if ($action == 'create') {
// editeur wysiwyg
if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
+ $doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, !empty($conf->global->FCKEDITOR_ENABLE_DETAILS), ROWS_2, '90%');
$doleditor->Create();
}
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d83a1438f1a..dcf6681df0e 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -135,7 +135,7 @@ $arrayfields = array(
'f.fk_statut'=>array('label'=>'Status', 'checked'=>1, 'position'=>1000),
'fd.description'=>array('label'=>"DescriptionOfLine", 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
'fd.date'=>array('label'=>'DateOfLine', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
- 'fd.duree'=>array('label'=>'DurationOfLine', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0),
+ 'fd.duree'=>array('label'=>'DurationOfLine', 'type'=> 'duration', 'checked'=>1, 'enabled'=>empty($conf->global->FICHINTER_DISABLE_DETAILS) ? 1 : 0), //type duration is here because in database, column 'duree' is double
);
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -768,7 +768,6 @@ if ($resql) {
}
if (!$i) {
$totalarray['type'][$totalarray['nbfield']] = 'duration';
- $totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
}
$totalarray['val']['fd.duree'] += $obj->duree;
}
@@ -792,6 +791,8 @@ if ($resql) {
$i++;
}
+
+
// Show total line
include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 154da0dce93..418d8fa6600 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -450,9 +450,9 @@ class SupplierInvoices extends DolibarrApi
}
// Calculate amount to pay
- $totalpaye = $this->invoice->getSommePaiement();
+ $totalpaid = $this->invoice->getSommePaiement();
$totaldeposits = $this->invoice->getSumDepositsUsed();
- $resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totaldeposits, 'MT');
+ $resteapayer = price2num($this->invoice->total_ttc - $totalpaid - $totaldeposits, 'MT');
$this->db->begin();
@@ -558,8 +558,8 @@ class SupplierInvoices extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->description = checkVal($request_data->description, 'restricthtml');
- $request_data->ref_supplier = checkVal($request_data->ref_supplier);
+ $request_data->description = sanitizeVal($request_data->description, 'restricthtml');
+ $request_data->ref_supplier = sanitizeVal($request_data->ref_supplier);
$updateRes = $this->invoice->addline(
$request_data->description,
@@ -625,8 +625,8 @@ class SupplierInvoices extends DolibarrApi
$request_data = (object) $request_data;
- $request_data->description = checkVal($request_data->description, 'restricthtml');
- $request_data->ref_supplier = checkVal($request_data->ref_supplier);
+ $request_data->description = sanitizeVal($request_data->description, 'restricthtml');
+ $request_data->ref_supplier = sanitizeVal($request_data->ref_supplier);
$updateRes = $this->invoice->updateline(
$lineid,
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 2ed936ee1f6..5bfafff57b5 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -80,6 +80,13 @@ class CommandeFournisseurDispatch extends CommonObjectLine
public $fk_commandefourndet;
public $qty;
+ public $qty_asked;
+
+ public $libelle;
+ public $desc;
+ public $tva_tx;
+ public $vat_src_code;
+ public $ref_supplier;
/**
* @var int ID
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b4193004a13..5ae7e8b9dd5 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -880,10 +880,10 @@ if (empty($reshook)) {
if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0) {
$facture_source = new FactureFournisseur($db); // fetch origin object if not previously defined
if ($facture_source->fetch($object->fk_facture_source) > 0) {
- $totalpaye = $facture_source->getSommePaiement();
+ $totalpaid = $facture_source->getSommePaiement();
$totalcreditnotes = $facture_source->getSumCreditNotesUsed();
$totaldeposits = $facture_source->getSumDepositsUsed();
- $remain_to_pay = abs($facture_source->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits);
+ $remain_to_pay = abs($facture_source->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits);
$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), $remain_to_pay, 0, 0, 0, 1, 0, 0, '', '', 'TTC');
}
@@ -1712,8 +1712,8 @@ if (empty($reshook)) {
// Set invoice to draft status
$object->fetch($id);
- $totalpaye = $object->getSommePaiement();
- $resteapayer = $object->total_ttc - $totalpaye;
+ $totalpaid = $object->getSommePaiement();
+ $resteapayer = $object->total_ttc - $totalpaid;
// We check that lines of invoices are exported in accountancy
$ventilExportCompta = $object->getVentilExportCompta();
@@ -2597,24 +2597,24 @@ if ($action == 'create') {
$societe = $object->thirdparty;
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
$totalcreditnotes = $object->getSumCreditNotesUsed();
$totaldeposits = $object->getSumDepositsUsed();
- // print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits."
+ // print "totalpaid=".$totalpaid." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits."
// selleruserrevenuestamp=".$selleruserevenustamp;
// We can also use bcadd to avoid pb with floating points
// For example print 239.2 - 229.3 - 9.9; does not return 0.
- // $resteapayer=bcadd($object->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+ // $resteapayer=bcadd($object->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);
// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
- $resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ $resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
// Multicurrency
if (!empty($conf->multicurrency->enabled)) {
- $multicurrency_totalpaye = $object->getSommePaiement(1);
+ $multicurrency_totalpaid = $object->getSommePaiement(1);
$multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
$multicurrency_totaldeposits = $object->getSumDepositsUsed(1);
- $multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaye - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
+ $multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaid - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
// Code to fix case of corrupted data
if ($resteapayer == 0 && $multicurrency_resteapayer != 0) {
$resteapayer = price2num($multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
@@ -2894,7 +2894,7 @@ if ($action == 'create') {
}
$morehtmlref .= '';
- $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -3227,7 +3227,7 @@ if ($action == 'create') {
// List of payments
- $totalpaye = 0;
+ $totalpaid = 0;
$sign = 1;
if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
@@ -3333,7 +3333,7 @@ if ($action == 'create') {
}
print ' ';
print ' ';
- $totalpaye += $objp->amount;
+ $totalpaid += $objp->amount;
$i++;
}
} else {
@@ -3343,10 +3343,10 @@ if ($action == 'create') {
/*
if ($object->paye == 0)
{
- print ''.$langs->trans('AlreadyPaid').' : '.price($totalpaye).' '.$langs->trans('AlreadyPaid').' : '.price($totalpaid).' '.$langs->trans("Billed").' : '.price($object->total_ttc).' '.$langs->trans('RemainderToPay').' : ';
print ''.price($resteapayer).' 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).' ';
+ print ' 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaid).' ';
- //$resteapayer = $object->total_ttc - $totalpaye;
+ //$resteapayer = $object->total_ttc - $totalpaid;
$resteapayeraffiche = $resteapayer;
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
@@ -3422,7 +3422,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
print ' ';
- print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).' ';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -3432,7 +3432,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
print ' ';
- print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).' ';
// $resteapayeraffiche=0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -3442,7 +3442,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
print ' ';
- print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).' ';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -3456,7 +3456,7 @@ if ($action == 'create') {
print '';
print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
print ' ';
- print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).' ';
+ print ''.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).' ';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
}
@@ -3498,7 +3498,7 @@ if ($action == 'create') {
// Total already paid back
print '';
print $langs->trans('AlreadyPaidBack');
- print ' : '.price($sign * $totalpaye).' '.price($sign * $totalpaid).' ';
// Billed
print ''.$langs->trans("Billed").' : '.price($sign * $object->total_ttc).' '.$langs->trans('ConvertExcessPaidToReduc').' ';
}
// For credit note
@@ -3718,7 +3718,7 @@ if ($action == 'create') {
// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (empty($conf->global->SUPPLIER_INVOICE_CAN_SET_PAID_EVEN_IF_PARTIALLY_PAID) || $object->total_ttc != $resteapayer)) {
- if ($totalpaye > 0 || $totalcreditnotes > 0) {
+ if ($totalpaid > 0 || $totalcreditnotes > 0) {
// If one payment or one credit note was linked to this invoice
print ''.$langs->trans('ClassifyPaidPartially').' ';
} else {
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 387e3fc39b8..8224fcc9c00 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -172,7 +172,7 @@ if ($id > 0 || !empty($ref)) {
}
$morehtmlref .= '';
- $object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index e08449b376b..5b7d797a02f 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -102,7 +102,7 @@ if ($object->id > 0) {
$head = facturefourn_prepare_head($object);
print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
- $totalpaye = $object->getSommePaiement();
+ $totalpaid = $object->getSommePaiement();
$linkback = ''.$langs->trans("BackToList").' ';
@@ -150,7 +150,7 @@ if ($object->id > 0) {
}
$morehtmlref .= '';
- $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 42031bc7fd9..0cbf0f17512 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -116,7 +116,7 @@ if (!empty($conf->projet->enabled)) {
}
$morehtmlref .= '';
-$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$object->totalpaid = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index a851e95e089..70a7334196a 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -323,10 +323,10 @@ if (empty($reshook)) {
$objecttmp = new FactureFournisseur($db);
$result = $objecttmp->fetch($toselectid);
if ($result > 0) {
- $totalpaye = $objecttmp->getSommePaiement();
+ $totalpaid = $objecttmp->getSommePaiement();
$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
$totaldeposits = $objecttmp->getSumDepositsUsed();
- $objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+ $objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
if ($objecttmp->statut == FactureFournisseur::STATUS_DRAFT) {
$error++;
setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index 3b14dfeaf28..59902947cef 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -144,7 +144,7 @@ if ($object->id > 0) {
}
$morehtmlref .= '';
- $object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+ $object->totalpaid = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 353083bd717..993d772a641 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -108,14 +108,14 @@ if ($socid > 0) {
print $fac->error."';
- print "".dol_print_date($fac->date)." \n";
+ print ''.dol_print_date($fac->date)." \n";
print "id\">".img_object($langs->trans("ShowBill"), "bill")." ".$fac->ref." '.$fac->getLibStatut(2, $totalpaye).' ';
+ print ''.$fac->getLibStatut(2, $totalpaid).' ';
print ''.price($fac->total_ttc)." \n";
$solde = $solde + $fac->total_ttc;
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ed6e421d302..5978b6a31be 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -101,7 +101,7 @@ if (!$sortorder) {
$sortorder = "DESC";
}
if (!$sortfield) {
- $sortfield = "cp.rowid";
+ $sortfield = "cp.ref";
}
$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 46a14450f3e..427e6a4dea6 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -153,18 +153,6 @@ $htmlother = new FormOther($db);
$formfile = new FormFile($db);
// Init $array_match_file_to_database from _SESSION
-$serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database"]) ? $_SESSION["dol_array_match_file_to_database"] : '';
-$array_match_file_to_database = array();
-$fieldsarray = explode(',', $serialized_array_match_file_to_database);
-foreach ($fieldsarray as $elem) {
- $tabelem = explode('=', $elem, 2);
- $key = $tabelem[0];
- $val = (isset($tabelem[1]) ? $tabelem[1] : '');
- if ($key && $val) {
- $array_match_file_to_database[$key] = $val;
- }
-}
-
if (empty($array_match_file_to_database)) {
$serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database_select"]) ? $_SESSION["dol_array_match_file_to_database_select"] : '';
$array_match_file_to_database = array();
@@ -492,7 +480,7 @@ if ($step == 2 && $datatoimport) {
$filetoimport = '';
// Add format informations and link to download example
- print ' ';
+ print ' ';
print $langs->trans("FileMustHaveOneOfFollowingFormat");
print ' '.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).' ';
print '';
- print img_picto('', 'download', 'class="paddingright opacitymedium"').''.$langs->trans("DownloadEmptyExample");
+ print ' ';
+ print img_picto('', 'download', 'class="paddingright opacitymedium"');
+ print $langs->trans("DownloadEmptyExample");
print ' ';
- print ' ('.$langs->trans("StarAreMandatory").') ';
+ print $form->textwithpicto('', $langs->trans("StarAreMandatory"));
print ' ';
// Action button
print '';
@@ -591,9 +581,11 @@ if ($step == 3 && $datatoimport) {
$text = $objmodelimport->getDriverDescForKey($format);
print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
print ' ';
- print img_picto('', 'download', 'class="paddingright opacitymedium"').''.$langs->trans("DownloadEmptyExample");
+ print ' ';
+ print img_picto('', 'download', 'class="paddingright opacitymedium"');
+ print $langs->trans("DownloadEmptyExample");
print ' ';
- print ' ('.$langs->trans("StarAreMandatory").') ';
+ print $form->textwithpicto('', $langs->trans("StarAreMandatory"));
print ' ';
print '
';
@@ -1072,14 +1064,14 @@ if ($step == 4 && $datatoimport) {
if (!$line["imported"]) {
$optionsnotused .= $text;
}
- $optionsall[$code] = array('label'=>$langs->trans($line["label"]), 'required'=>(empty($line["required"]) ? 0 : 1), 'position'=>$line['position']);
+ $optionsall[$code] = array('label'=>$langs->trans($line["label"]), 'required'=>(empty($line["required"]) ? 0 : 1), 'position'=>!empty($line['position']) ? $line['position'] : 0);
}
// $optionsall is an array of all possible fields. key=>array('label'=>..., 'xxx')
$height = '32px'; //needs px for css height attribute below
$i = 0;
$mandatoryfieldshavesource = true;
-
+ $more = "";
//var_dump($fieldstarget);
//var_dump($optionsall);
//exit;
@@ -1100,7 +1092,7 @@ if ($step == 4 && $datatoimport) {
$entity = (!empty($objimport->array_import_entities[0][$code]) ? $objimport->array_import_entities[0][$code] : $objimport->array_import_icon[0]);
$tablealias = preg_replace('/(\..*)$/i', '', $code);
- $tablename = $objimport->array_import_tables[0][$tablealias];
+ $tablename = !empty($objimport->array_import_tables[0][$tablealias]) ? $objimport->array_import_tables[0][$tablealias] : "";
$entityicon = !empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ...
$entitylang = $entitytolang[$entity] ? $entitytolang[$entity] : $objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ...
@@ -1118,8 +1110,8 @@ if ($step == 4 && $datatoimport) {
//var_dump($_SESSION['dol_array_match_file_to_database']);
//var_dump($modetoautofillmapping);
- print '
';
- if ($line["imported"]) {
+ print '';
+ if (!empty($line["imported"])) {
print ' ';
} else {
print ' ';
@@ -1166,10 +1158,10 @@ if ($step == 4 && $datatoimport) {
//var_dump($code);
//var_dump($tmpselectioninsession);
//if ($tmpselectioninsession[$j] == $code) {
- if ($tmpselectioninsession[($i+1)] == $tmpcode) {
+ if (!empty($tmpselectioninsession[($i+1)]) && $tmpselectioninsession[($i+1)] == $tmpcode) {
print ' selected';
}
- print ' data-debug="'.$tmpcode.'-'.$code.'-'.$j.'-'.$tmpselectioninsession[($i+1)].'"';
+ print ' data-debug="'.$tmpcode.'-'.$code.'-'.$j.'-'.(!empty($tmpselectioninsession[($i+1)]) ? $tmpselectioninsession[($i+1)] : "").'"';
}
print ' data-html="'.dol_escape_htmltag($label).'"';
print '>';
@@ -1234,7 +1226,7 @@ if ($step == 4 && $datatoimport) {
$htmltext .= $langs->trans("DataCodeIDSourceIsInsertedInto").'".$langs->trans($line["label"])." ".$langs->trans($fieldstarget[$arraykeysfieldtarget[$code-1]]["label"])." '.$tablename." -> ".preg_replace('/^.*\./', '', $code)." ';
- print $langs->trans("KeysToUseForUpdates");
+ print $form->textwithpicto($langs->trans("KeysToUseForUpdates"), $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
print ' ';
if ($action == 'launchsimu') {
if (count($updatekeys)) {
@@ -1672,7 +1664,7 @@ if ($step == 5 && $datatoimport) {
} else {
if (is_array($objimport->array_import_updatekeys[0]) && count($objimport->array_import_updatekeys[0])) { //TODO dropdown UL is created inside nested SPANS
print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
- print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
+ //print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
} else {
print ''.$langs->trans("UpdateNotYetSupportedForThisImport").' ';
}
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index b041e07b95f..d78fea4ad4d 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -400,5 +400,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (23
--delete from llx_c_tva where rowid = 1181; -- to delete a record that does not follow rules for rowid (fk_pays+'1')
--insert into llx_c_tva(rowid, fk_pays, taux, recuperableonly, note, active) SELECT CONCAT(c.rowid, '1'), c.rowid, 0, 0, 'No VAT', 1 from llx_c_country as c where c.rowid not in (select fk_pays from llx_c_tva);
-
-
+-- BURUNDI (id country=61) -- https://www.objectif-import-export.fr/fr/marches-internationaux/fiche-pays/burundi/presentation-fiscalite
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2335,61, '0','0','No VAT',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2336,61, '10','0','VAT 10%',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2337,61, '18','0','VAT 18%',1);
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index 6d2ec750b86..9cd8561781c 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -14,7 +14,9 @@
-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
-- To drop an index: -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
-- To drop an index: -- VPGSQL8.2 DROP INDEX nomindex;
--- To make pk to be auto increment (mysql): -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (mysql):
+-- -- VMYSQL4.3 ALTER TABLE llx_table ADD PRIMARY KEY(rowid);
+-- -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
-- To make pk to be auto increment (postgres):
-- -- VPGSQL8.2 CREATE SEQUENCE llx_table_rowid_seq OWNED BY llx_table.rowid;
-- -- VPGSQL8.2 ALTER TABLE llx_table ADD PRIMARY KEY (rowid);
@@ -33,8 +35,24 @@
-- Missing in v15 or lower
+-- VMYSQL4.3 ALTER TABLE llx_c_civility ADD PRIMARY KEY(rowid);
-- VMYSQL4.3 ALTER TABLE llx_c_civility CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- VMYSQL4.3 ALTER TABLE llx_c_payment_term ADD PRIMARY KEY(rowid);
+-- VMYSQL4.3 ALTER TABLE llx_c_payment_term CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+
+-- VPGSQL8.2 CREATE SEQUENCE llx_c_civility_rowid_seq OWNED BY llx_c_civility.rowid;
+-- VPGSQL8.2 ALTER TABLE llx_c_civility ADD PRIMARY KEY (rowid);
+-- VPGSQL8.2 ALTER TABLE llx_c_civility ALTER COLUMN rowid SET DEFAULT nextval('llx_c_civility_rowid_seq');
+-- VPGSQL8.2 SELECT setval('llx_c_civility_rowid_seq', MAX(rowid)) FROM llx_c_civility;
+
+-- VPGSQL8.2 CREATE SEQUENCE llx_c_payment_term_rowid_seq OWNED BY llx_c_payment_term.rowid;
+-- VPGSQL8.2 ALTER TABLE llx_c_payment_term ADD PRIMARY KEY (rowid);
+-- VPGSQL8.2 ALTER TABLE llx_c_payment_term ALTER COLUMN rowid SET DEFAULT nextval('llx_c_payment_term_rowid_seq');
+-- VPGSQL8.2 SELECT setval('llx_c_payment_term_rowid_seq', MAX(rowid)) FROM llx_c_payment_term;
+
+
+
ALTER TABLE llx_c_transport_mode ADD UNIQUE INDEX uk_c_transport_mode (code, entity);
ALTER TABLE llx_c_shipment_mode MODIFY COLUMN tracking varchar(255) NULL;
@@ -118,6 +136,7 @@ ALTER TABLE llx_bank ADD COLUMN amount_main_currency double(24,8) NULL;
-- v16
+ALTER TABLE llx_c_stcomm MODIFY COLUMN code VARCHAR(24) NOT NULL;
ALTER TABLE llx_societe_account DROP FOREIGN KEY llx_societe_account_fk_website;
UPDATE llx_cronjob set label = 'RecurringInvoicesJob' where label = 'RecurringInvoices';
@@ -594,3 +613,8 @@ ALTER TABLE llx_fichinter ADD COLUMN ref_client varchar(255) after ref_ext;
ALTER TABLE llx_c_holiday_types ADD COLUMN sortorder smallint;
ALTER TABLE llx_expedition MODIFY COLUMN ref_customer varchar(255);
+
+ALTER TABLE llx_extrafields ADD COLUMN css varchar(128);
+ALTER TABLE llx_extrafields ADD COLUMN cssview varchar(128);
+ALTER TABLE llx_extrafields ADD COLUMN csslist varchar(128);
+
diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql
index aa5d58a280f..f94ba35be7b 100644
--- a/htdocs/install/mysql/tables/llx_c_stcomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql
@@ -21,7 +21,7 @@
create table llx_c_stcomm
(
id integer PRIMARY KEY,
- code varchar(12) NOT NULL,
+ code varchar(24) NOT NULL,
libelle varchar(128),
picto varchar(128),
active tinyint default 1 NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 1ade8502bf5..33a317d4abd 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -40,6 +40,9 @@ create table llx_extrafields
totalizable boolean DEFAULT FALSE, -- is extrafield totalizable on list
langs varchar(64), -- example: fileofmymodule@mymodule
help text, -- to store help tooltip
+ css varchar(128), -- to store css on create/update forms
+ cssview varchar(128), -- to store css on view form
+ csslist varchar(128), -- to store css on list
fk_user_author integer, -- user making creation
fk_user_modif integer, -- user making last change
datec datetime, -- date de creation
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index 5d26fa90137..b95a5717932 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -19,6 +19,7 @@
use Luracast\Restler\RestException;
dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+dol_include_once('/categories/class/categorie.class.php');
@@ -85,6 +86,39 @@ class KnowledgeManagement extends DolibarrApi
return $this->_cleanObjectDatas($this->knowledgerecord);
}
+ /**
+ * Get categories for a knowledgerecord object
+ *
+ * @param int $id ID of knowledgerecord object
+ * @param string $sortfield Sort field
+ * @param string $sortorder Sort order
+ * @param int $limit Limit for list
+ * @param int $page Page number
+ *
+ * @return mixed
+ *
+ * @url GET /knowledgerecords/{id}/categories
+ */
+ public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+ {
+ if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+ throw new RestException(401);
+ }
+
+ $categories = new Categorie($this->db);
+
+ $result = $categories->getListForItem($id, 'knowledgemanagement', $sortfield, $sortorder, $limit, $page);
+
+ if (empty($result)) {
+ throw new RestException(404, 'No category found');
+ }
+
+ if ($result < 0) {
+ throw new RestException(503, 'Error when retrieve category list : '.array_merge(array($categories->error), $categories->errors));
+ }
+
+ return $result;
+ }
/**
* List knowledgerecords
@@ -218,7 +252,7 @@ class KnowledgeManagement extends DolibarrApi
}
// Clean data
- // $this->knowledgerecord->abc = checkVal($this->knowledgerecord->abc, 'alphanohtml');
+ // $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml');
if ($this->knowledgerecord->create(DolibarrApiAccess::$user)<0) {
throw new RestException(500, "Error creating KnowledgeRecord", array_merge(array($this->knowledgerecord->error), $this->knowledgerecord->errors));
@@ -260,7 +294,7 @@ class KnowledgeManagement extends DolibarrApi
}
// Clean data
- // $this->knowledgerecord->abc = checkVal($this->knowledgerecord->abc, 'alphanohtml');
+ // $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml');
if ($this->knowledgerecord->update(DolibarrApiAccess::$user, false) > 0) {
return $this->get($id);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index 9204672ba5a..b903ab83acc 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -95,7 +95,7 @@ if (!$sortorder) {
}
// Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
$search = array();
foreach ($object->fields as $key => $val) {
if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -124,11 +124,11 @@ $arrayfields = array();
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $visible = (int) dol_eval($val['visible'], 1, 1, '1');
+ $visible = (int) dol_eval($val['visible'], 1);
$arrayfields['t.'.$key] = array(
'label'=>$val['label'],
'checked'=>(($visible < 0) ? 0 : 1),
- 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+ 'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
'position'=>$val['position'],
'help'=> isset($val['help']) ? $val['help'] : ''
);
@@ -234,13 +234,13 @@ $sql .= $object->getFieldList('t');
// Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
- $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key." as options_".$key.', ' : '');
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
}
}
// Add fields from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= preg_replace('/^,/', ',', $hookmanager->resPrint);
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
$sql = preg_replace('/,\s*$/', '', $sql);
$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -278,10 +278,10 @@ foreach ($search as $key => $val) {
$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
if (preg_match('/_dtstart$/', $key)) {
- $sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
+ $sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
}
if (preg_match('/_dtend$/', $key)) {
- $sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+ $sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
}
}
}
@@ -340,35 +340,34 @@ $sql.=$hookmanager->resPrint;
$sql=preg_replace('/,\s*$/','', $sql);
*/
-$sql .= $db->order($sortfield, $sortorder);
-
// Count total nb of records
$nbtotalofrecords = '';
if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
$resql = $db->query($sql);
$nbtotalofrecords = $db->num_rows($resql);
+
if (($page * $limit) > $nbtotalofrecords) { // if total of record found is smaller than page * limit, goto and load page 0
$page = 0;
$offset = 0;
}
+ $db->free($resql);
}
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
- $num = $nbtotalofrecords;
-} else {
- if ($limit) {
- $sql .= $db->plimit($limit + 1, $offset);
- }
- $resql = $db->query($sql);
- if (!$resql) {
- dol_print_error($db);
- exit;
- }
-
- $num = $db->num_rows($resql);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+ $sql .= $db->plimit($limit + 1, $offset);
}
+$resql = $db->query($sql);
+if (!$resql) {
+ dol_print_error($db);
+ exit;
+}
+
+$num = $db->num_rows($resql);
+
+
// Direct jump if only one record found
if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
$obj = $db->fetch_object($resql);
@@ -381,12 +380,15 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
// Output page
// --------------------------------------------------------------------
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
$arrayofselected = is_array($toselect) ? $toselect : array();
$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
@@ -396,9 +398,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
foreach ($search as $key => $val) {
if (is_array($search[$key]) && count($search[$key])) {
foreach ($search[$key] as $skey) {
- $param .= '&search_'.$key.'[]='.urlencode($skey);
+ if ($skey != '') {
+ $param .= '&search_'.$key.'[]='.urlencode($skey);
+ }
}
- } else {
+ } elseif ($search[$key] != '') {
$param .= '&search_'.$key.'='.urlencode($search[$key]);
}
}
@@ -455,10 +459,13 @@ $trackid = 'xxxx'.$object->id;
include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
if ($search_all) {
+ $setupstring = '';
foreach ($fieldstosearchall as $key => $val) {
$fieldstosearchall[$key] = $langs->trans($val);
+ $setupstring .= $key."=".$val.";";
}
- print ''.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'
';
+ print ''."\n";
+ print ''.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'
'."\n";
}
$moreforfilter = '';
@@ -503,6 +510,13 @@ print '';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '';
+ $searchpicto = $form->showFilterButtons('left');
+ print $searchpicto;
+ print ' ';
+}
foreach ($object->fields as $key => $val) {
$searchkey = empty($search[$key]) ? '' : $search[$key];
$cssforfield = (empty($val['css']) ? '' : $val['css']);
@@ -512,16 +526,16 @@ foreach ($object->fields as $key => $val) {
$cssforfield .= ($cssforfield ? ' ' : '').'center';
} elseif (in_array($val['type'], array('timestamp'))) {
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
- } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+ } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
$cssforfield .= ($cssforfield ? ' ' : '').'right';
}
if (!empty($arrayfields['t.'.$key]['checked'])) {
print '';
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
- print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $searchkey, $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+ print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
- print $object->showInputField($val, $key, $searchkey, '', '', 'search_', 'maxwidth125', 1);
+ print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
print '';
print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -530,9 +544,11 @@ foreach ($object->fields as $key => $val) {
print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
} elseif ($key == 'lang') {
- print $formadmin->select_language($searchkey, 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+ $formadmin = new FormAdmin($db);
+ print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
} else {
- print ' ';
}
@@ -545,16 +561,23 @@ $parameters = array('arrayfields'=>$arrayfields);
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print '';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print ' ';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '';
+ $searchpicto = $form->showFilterButtons();
+ print $searchpicto;
+ print ' ';
+}
print ''."\n";
+$totalarray = array();
+$totalarray['nbfield'] = 0;
// Fields title label
// --------------------------------------------------------------------
print '';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if ($key == 'status') {
@@ -563,11 +586,13 @@ foreach ($object->fields as $key => $val) {
$cssforfield .= ($cssforfield ? ' ' : '').'center';
} elseif (in_array($val['type'], array('timestamp'))) {
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
- } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+ } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
$cssforfield .= ($cssforfield ? ' ' : '').'right';
}
+ $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
if (!empty($arrayfields['t.'.$key]['checked'])) {
print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+ $totalarray['nbfield']++;
}
}
// Extra fields
@@ -577,7 +602,10 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
print ' '."\n";
@@ -595,8 +623,10 @@ if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_a
// Loop on record
// --------------------------------------------------------------------
$i = 0;
-$totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$savnbfield = $totalarray['nbfield'];
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
if (empty($obj)) {
break; // Should not happen
@@ -606,8 +636,20 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$object->setVarsFromFetchObj($obj);
// Show here line of result
- print '';
- $totalarray['nbfield'] = 0;
+ $j = 0;
+ print ' ';
+ // Action column
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
+ }
foreach ($object->fields as $key => $val) {
$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -622,14 +664,20 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
}
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+ if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
$cssforfield .= ($cssforfield ? ' ' : '').'right';
}
//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
if (!empty($arrayfields['t.'.$key]['checked'])) {
- print '';
+ print '';
if ($key == 'status') {
print $object->getLibStatut(5);
+ } elseif ($key == 'rowid') {
+ print $object->showOutputField($val, $key, $object->id, '');
} elseif ($key == 'fk_user_creat') {
if ($object->fk_user_creat > 0) {
if (isset($conf->cache['user'][$object->fk_user_creat])) {
@@ -695,15 +743,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
// Action column
- print '';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($object->id, $arrayofselected)) {
- $selected = 1;
+ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print ' ';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($object->id, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
}
- print '';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -724,14 +774,14 @@ if ($num == 0) {
$colspan++;
}
}
- print ''.$langs->trans("NoRecordFound").' '.$langs->trans("NoRecordFound").'
'."\n";
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d122e9ca7d1..808049978eb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1949,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
Enter0or1=Enter 0 or 1
UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
ColorFormat=The RGB color is in HEX format, eg: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Icon name in format:dolibarr.log file to trap Logs
UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use the dolibarr.log file to trap Logs instead of live memory catching. It allows to catch all logs instead of only log of current process (so including the one of ajax subrequests pages) but will make your instance very very slow. Not recommended.
FixedOrPercent=Fixed (use keyword 'fixed') or percent (use keyword 'percent')
-DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
\ No newline at end of file
+DefaultOpportunityStatus=Default opportunity status (first status when lead is created)
+IconAndText=Icon and text
+TextOnly=Text only
+IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover the icon
+IconOnly=Icon only - Text on tooltip only
+INVOICE_ADD_ZATCA_QR_CODE=Show the ZATCA QR code on invoices
+INVOICE_ADD_ZATCA_QR_CODEMore=Some Arabic countries need this QR Code on their invoices
+UrlSocialNetworksDesc=Url link of social network. Use {socialid} for the variable part that contains the social network ID.
\ No newline at end of file
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index a3e0bc2f901..10ba859e71f 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -172,8 +172,8 @@ SEPAMandate=SEPA mandate
YourSEPAMandate=Your SEPA mandate
FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
AutoReportLastAccountStatement=Automatically fill the field 'number of bank statement' with last statement number when making reconciliation
-CashControl=POS cash desk control
-NewCashFence=New cash desk opening or closing
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
BankColorizeMovement=Colorize movements
BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements
BankColorizeMovementName1=Background color for debit movement
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index dc02f4e9325..8f7f7548de0 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Footer
AmountAtEndOfPeriod=Amount at end of period (day, month or year)
TheoricalAmount=Theorical amount
RealAmount=Real amount
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
NbOfInvoices=Nb of invoices
Paymentnumpad=Type of Pad to enter payment
Numberspad=Numbers Pad
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = {TN} tag is used to add the terminal numb
TakeposGroupSameProduct=Group same products lines
StartAParallelSale=Start a new parallel sale
SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
CashReport=Cash report
MainPrinterToUse=Main printer to use
OrderPrinterToUse=Order printer to use
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 8f44b999a3a..c4a964b6b62 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -163,14 +163,14 @@ ProfId5CL=-
ProfId6CL=-
ProfId1CM=Id. prof. 1 (Trade Register)
ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
ProfId5CM=Id. prof. 5 (Others)
ProfId6CM=-
ProfId1ShortCM=Trade Register
ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=Certificate of deposits
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
ProfId5ShortCM=Others
ProfId6ShortCM=-
ProfId1CO=Prof Id 1 (R.U.T.)
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index e7ac91e5722..9dc400f91f7 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Type of line (0=product, 1=service)
FileWithDataToImport=File with data to import
FileToImport=Source file to import
FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
+DownloadEmptyExample=Download a template file with examples and information on fields you can import
+StarAreMandatory=Into the template file, all fields with a * are mandatory fields
ChooseFormatOfFileToImport=Choose the file format to use as import file format by clicking on the %s icon to select it...
ChooseFileToImport=Upload file then click on the %s icon to select file as source import file...
SourceFileFormat=Source file format
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 97111df74cd..05d0ec1e060 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1175,4 +1175,6 @@ ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selecte
CommercialsAffected=Sales representatives affected
CommercialAffected=Sales representative affected
YourMessage=Votre message
-YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
\ No newline at end of file
+YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
+UrlToCheck=Url to check
+Automation=Automation
\ No newline at end of file
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 224273d84e6..7f29b774b29 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -109,6 +109,6 @@ THMEstimatedHelp=This rate makes it possible to define a forecast cost of the it
BOM=Bill Of Materials
CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
MOAndLines=Manufacturing Orders and lines
-BOMNetNeeds=Net Needs
-TreeStructure=Tree structure
-GroupByProduct=Group by product
\ No newline at end of file
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 587231f752f..9857ad821ed 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile ';
}
foreach ($object->fields as $key => $val) {
- $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+ $searchkey = empty($search[$key]) ? '' : $search[$key];
+ $cssforfield = (empty($val['css']) ? '' : $val['css']);
if ($key == 'status') {
$cssforfield .= ($cssforfield ? ' ' : '').'center';
} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -673,6 +674,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
// --------------------------------------------------------------------
$i = 0;
$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
$totalarray['nbfield'] = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
while ($i < $imaxinloop) {
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 67f5fe68161..b99d03050ce 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -120,6 +120,7 @@ class Mo extends CommonObject
'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '9'=>'Canceled')),
+ 'fk_parent_line' => array('type'=>'integer:MoLine:mrp/class/mo.class.php', 'label'=>'ParentMo', 'enabled'=>1, 'visible'=>0, 'position'=>1020, 'default'=>0, 'notnull'=>0, 'index'=>1,'showoncombobox'=>0),
);
public $rowid;
public $entity;
@@ -201,6 +202,11 @@ class Mo extends CommonObject
*/
public $lines = array();
+ /**
+ * @var integer Mo parent line
+ * */
+
+ public $fk_parent_line;
/**
@@ -1267,15 +1273,18 @@ class Mo extends CommonObject
/**
* Create an array of lines
- *
+ * @param string $rolefilter string lines role filter
* @return array|int array of lines if OK, <0 if KO
*/
- public function getLinesArray()
+ public function getLinesArray($rolefilter = '')
{
$this->lines = array();
$objectline = new MoLine($this->db);
- $result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.((int) $this->id)));
+
+ $TFilters = array('customsql'=>'fk_mo = '.((int) $this->id));
+ if (!empty($rolefilter)) $TFilters['role'] = $rolefilter;
+ $result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
if (is_numeric($result)) {
$this->error = $this->error;
@@ -1380,6 +1389,13 @@ class Mo extends CommonObject
$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? '- '.$langs->trans("StockOnReception").'';
+ // Product or sub-bom
+ print ''.$langs->trans('Description');
+ if (!empty($conf->global->BOM_SUB_BOM)) {
+ print ' '.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").' ';
+ print ''.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").' ';
+ }
+ print ' ';
print ''.$langs->trans('Ref').' ';
print ''.$langs->trans('Qty');
if ($this->bom->bomtype == 0) {
@@ -1392,9 +1408,9 @@ class Mo extends CommonObject
print ' '.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).' ';
print ''.$langs->trans('QtyFrozen').' ';
print ''.$langs->trans('DisableStockChange').' ';
- //print ''.$langs->trans('Efficiency').' ';
+ print ''.$langs->trans('MoChildGenerate').' ';
//print ''.$form->showCheckAddButtons('checkforselect', 1).' ';
- print ' ';
$i = 0;
@@ -1478,6 +1494,81 @@ class Mo extends CommonObject
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
}
+
+
+ /**
+ * Function used to return childs of Mo
+ *
+ * @return array if OK, -1 if KO
+ */
+ public function getMoChilds()
+ {
+
+ $TMoChilds = array();
+ $error = 0;
+
+ $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_mo as mo_child";
+ $sql.= " WHERE fk_parent_line IN ";
+ $sql.= " (SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_production as line_parent";
+ $sql.= " WHERE fk_mo=".((int) $this->id).")";
+
+ $resql = $this->db->query($sql);
+
+ if ($resql) {
+ if ($this->db->num_rows($resql) > 0) {
+ while ($obj = $this->db->fetch_object($resql)) {
+ $MoChild = new Mo($this->db);
+ $res = $MoChild->fetch($obj->rowid);
+ if ($res > 0) $TMoChilds[$MoChild->id] = $MoChild;
+ else $error++;
+ }
+ }
+ } else {
+ $error++;
+ }
+
+ if ($error) {
+ return -1;
+ } else {
+ return $TMoChilds;
+ }
+ }
+
+ /**
+ * Function used to return childs of Mo
+ *
+ * @return object Mo if OK, -1 if KO, 0 if not exist
+ */
+ public function getMoParent()
+ {
+
+ $MoParent = new Mo($this->db);
+ $error = 0;
+
+ $sql = "SELECT lineparent.fk_mo as id_moparent FROM ".MAIN_DB_PREFIX."mrp_mo as mo";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production lineparent ON mo.fk_parent_line = lineparent.rowid";
+ $sql.= " WHERE mo.rowid = ".((int) $this->id);
+
+ $resql = $this->db->query($sql);
+
+ if ($resql) {
+ if ($this->db->num_rows($resql) > 0) {
+ $obj = $this->db->fetch_object($resql);
+ $res = $MoParent->fetch($obj->id_moparent);
+ if ($res < 0) $error++;
+ } else {
+ return 0;
+ }
+ } else {
+ $error++;
+ }
+
+ if ($error) {
+ return -1;
+ } else {
+ return $MoParent;
+ }
+ }
}
/**
@@ -1520,7 +1611,7 @@ class MoLine extends CommonObjectLine
'role' =>array('type'=>'varchar(10)', 'label'=>'Role', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
'fk_mrp_production' =>array('type'=>'integer', 'label'=>'Fk mrp production', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
'fk_stock_movement' =>array('type'=>'integer', 'label'=>'StockMovement', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
- 'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>160),
+ 'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>160),
'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>165),
'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>170),
'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
@@ -1671,7 +1762,7 @@ class MoLine extends CommonObjectLine
if ($resql) {
$num = $this->db->num_rows($resql);
$i = 0;
- while ($i < min($limit, $num)) {
+ while ($i < ($limit ? min($limit, $num) : $num)) {
$obj = $this->db->fetch_object($resql);
$record = new self($this->db);
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 48f64b2601c..f60710d9da1 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp_mo.lib.php';
require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
+
// Load translation files required by the page
$langs->loadLangs(array("mrp", "other"));
@@ -44,6 +46,7 @@ $cancel = GETPOST('cancel', 'aZ09');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'mocard'; // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha');
$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$TBomLineId = GETPOST('bomlineid', 'array');
//$lineid = GETPOST('lineid', 'int');
// Initialize technical objects
@@ -128,9 +131,41 @@ if (empty($reshook)) {
if ($cancel && !empty($backtopageforcancel)) {
$backtopage = $backtopageforcancel;
}
-
$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+ //Create MO with Childs
+ if ($action == 'add' && empty($id) && !empty($TBomLineId)) {
+ $noback = 0;
+ include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+ $mo_parent = $object;
+
+ $moline = new MoLine($db);
+ $objectbomchildline = new BOMLine($db);
+
+ foreach ($TBomLineId as $id_bom_line) {
+ $object = new Mo($db);
+
+ $objectbomchildline->fetch($id_bom_line);
+
+ $TMoLines = $moline->fetchAll('DESC', 'rowid', '1', '', array('origin_id' => $id_bom_line));
+
+ foreach ($TMoLines as $moline) {
+ $_POST['fk_bom'] = $objectbomchildline->fk_bom_child;
+ $_POST['fk_parent_line'] = $moline->id;
+ $_POST['qty'] = $moline->qty;
+ $_POST['fk_product'] = $moline->fk_product;
+ }
+
+ include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+ $res = $object->add_object_linked('mo', $mo_parent->id);
+ }
+
+ header("Location: ".dol_buildpath('/mrp/mo_card.php?id='.$moline->fk_mo, 1));
+ exit;
+ }
+
// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
@@ -240,10 +275,12 @@ if ($action == 'create') {
print dol_get_fiche_end();
+ print mrpCollapseBomManagement();
+
?>
";
}
$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='1' and fk_facture=".$invoice->id; // Set as printed
@@ -836,7 +836,7 @@ if (empty($reshook)) {
$printer->orderprinter = 2;
echo "";
}
$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='2' and fk_facture=".$invoice->id; // Set as printed
@@ -868,7 +868,7 @@ if (empty($reshook)) {
$printer->orderprinter = 3;
echo "";
}
$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='3' and fk_facture=".$invoice->id; // Set as printed
@@ -1444,7 +1444,11 @@ if ($placeid > 0) {
if ($line->special_code == "4") {
$htmlsupplements[$line->fk_parent_line] .= ' order';
}
- $htmlsupplements[$line->fk_parent_line] .= '" id="'.$line->id.'">';
+ $htmlsupplements[$line->fk_parent_line] .= '" id="'.$line->id.'"';
+ if ($line->special_code == "4") {
+ $htmlsupplements[$line->fk_parent_line] .= ' title="'.dol_escape_htmltag("AlreadyPrinted").'"';
+ }
+ $htmlsupplements[$line->fk_parent_line] .= '>';
$htmlsupplements[$line->fk_parent_line] .= '';
$htmlsupplements[$line->fk_parent_line] .= img_picto('', 'rightarrow');
if ($line->product_label) {
@@ -1483,7 +1487,11 @@ if ($placeid > 0) {
if ($line->special_code == "4") {
$htmlforlines .= ' order';
}
- $htmlforlines .= '" id="'.$line->id.'">';
+ $htmlforlines .= '" id="'.$line->id.'"';
+ if ($line->special_code == "4") {
+ $htmlforlines .= ' title="'.dol_escape_htmltag("AlreadyPrinted").'"';
+ }
+ $htmlforlines .= '>';
$htmlforlines .= ' ';
if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
$htmlforlines .= ''.$line->qty." x ";
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 338b4cf2759..0ca47fbd2bb 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -396,7 +396,7 @@ a.dropdown-item {
content: "\f35d";
}
-.dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus {
+.dropdown-item.active, .dropdown-item:hover, .dropdown-item:hover span::before, .dropdown-item:focus {
color: # !important;
text-decoration: none;
background: rgb();
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 19abdd3ba9b..9eb615d2355 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -149,7 +149,8 @@ select.vmenusearchselectcombo {
background-color: unset;
}
-table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
+table.liste th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
overflow: hidden;
white-space: nowrap;
max-width: 100px;
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 2d33a716692..77270b9d818 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -10,7 +10,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
*/
.info-box-module.--external span.info-box-icon-version {
- background: #bbb;
+ background: rgba(0,0,0,0.2);
}
.info-box-module.--external.--need-update span.info-box-icon-version{
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 615951bbbd9..1f60f0b7c2a 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -400,7 +400,7 @@ a.dropdown-item {
content: "\f35d";
}
-.dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus {
+.dropdown-item.active, .dropdown-item:hover, .dropdown-item:hover::before, .dropdown-item:hover span::before, .dropdown-item:focus {
color: # !important;
text-decoration: none;
background: rgb();
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 261e89c64be..73337ba0284 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -403,7 +403,8 @@ textarea.cke_source:focus
box-shadow: none;
}
-th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
+th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
overflow: hidden;
white-space: nowrap;
max-width: 120px;
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index fa68b3e6cdf..92d0490f1c6 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -29,10 +29,6 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
-if (!$user->rights->user->user->lire && !$user->admin) {
- accessforbidden();
-}
-
// Load translation files required by page
$langs->loadLangs(array('users', 'companies'));
@@ -51,7 +47,6 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
// Load mode employee
$mode = GETPOST("mode", 'alpha');
-$userstatic = new User($db);
$search_statut = GETPOST('search_statut', 'int');
if ($search_statut == '' || $search_statut == '0') {
@@ -62,9 +57,16 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
$search_statut = "";
}
+$userstatic = new User($db);
+
// Define value to know what current user can do on users
$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
+if (!$user->rights->user->user->lire && !$user->admin) {
+ accessforbidden();
+}
+
+$childids = $user->getAllChildIds(1);
/*
@@ -73,19 +75,25 @@ $canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
$form = new Form($db);
-$title = $langs->trans("Users").' - '.$langs->trans("HierarchicView");
+$help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:Módulo_Usuarios|DE:Modul_Benutzer';
+$title = $langs->trans("Users");
$arrayofjs = array(
'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
);
$arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
-llxHeader('', $title, '', '', 0, 0, $arrayofjs, $arrayofcss, '', 'bodyforlist');
+llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', 'bodyforlist');
// Load hierarchy of users
$user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_statut >= 0) ? "statut = ".$search_statut : '');
+
+// Count total nb of records
+$nbtotalofrecords = count($user_arbo);
+
+
if (!is_array($user_arbo) && $user_arbo < 0) {
setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
} else {
@@ -142,12 +150,12 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
//var_dump($data);
- $param = "search_statut=".urlencode($search_statut);
+ $param = "&search_statut=".urlencode($search_statut);
$newcardbutton = '';
- $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=kanban'.(($search_statut != '' && $search_statut >= 0) ? '&search_statut='.$search_statut : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
- $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=common'.(($search_statut != '' && $search_statut >= 0) ? '&search_statut='.$search_statut : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
- $newcardbutton .= dolGetButtonTitle($langs->trans('HierarchicView'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php?mode=hierarchy'.(($search_statut != '' && $search_statut >= 0) ? '&search_statut='.$search_statut : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', (($mode == 'hierarchy') ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('HierarchicView'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php?mode=hierarchy'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', (($mode == 'hierarchy') ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
$newcardbutton .= dolGetButtonTitleSeparator();
$newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=', '', $canadduser);
@@ -155,18 +163,19 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
$num = 0;
$limit = 0;
- print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, '', 'user', 0, $newcardbutton, '', $limit, 0, 0, 1);
+ print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $newcardbutton, '', $limit, 0, 0, 1);
print '