'; print '
'; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 6da25c8ef01..225261e8f9f 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -3203,4 +3203,40 @@ class Adherent extends CommonObject return $nbko; } + + /** + * Return clicable link of object (with eventually picto) + * + * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link) + * @return string HTML Code for Kanban thumb. + */ + public function getKanbanView($option = '') + { + + $return = '
';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 50bbbca42d7..d06d91cbea6 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -47,6 +47,7 @@ $show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
+$mode = GETPOST('mode', 'alpha');
// Search fields
@@ -72,7 +73,7 @@ $search_categ = GETPOST("search_categ", 'int');
$search_filter = GETPOST("search_filter", 'alpha');
$search_status = GETPOST("search_status", 'intcomma');
$search_morphy = GETPOST("search_morphy", 'alpha');
-$search_import_key = trim(GETPOST("search_import_key", "alpha"));
+$search_import_key = trim(GETPOST("search_import_key", 'alpha'));
$catid = GETPOST("catid", 'int');
$optioncss = GETPOST('optioncss', 'alpha');
$socid = GETPOST('socid', 'int');
@@ -140,6 +141,7 @@ $fieldstosearchall = array(
if ($db->type == 'pgsql') {
unset($fieldstosearchall['d.rowid']);
}
+
$arrayfields = array(
'd.ref'=>array('label'=>"Ref", 'checked'=>1),
'd.civility'=>array('label'=>"Civility", 'checked'=>0),
@@ -168,6 +170,7 @@ $arrayfields = array(
'd.statut'=>array('label'=>"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';
@@ -316,7 +319,11 @@ $formother = new FormOther($db);
$membertypestatic = new AdherentType($db);
$memberstatic = new Adherent($db);
-$title = $langs->trans("Members");
+// Page Header
+$title = $langs->trans("Members")." - ".$langs->trans("List");;
+$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros|DE:Modul_Mitglieder';
+llxHeader('', $title, $help_url);
+
$now = dol_now();
@@ -334,12 +341,14 @@ $sql .= " s.nom,";
$sql .= " ".$db->ifsql("d.societe IS NULL", "s.nom", "d.societe")." as companyname,";
$sql .= " t.libelle as type, t.subscription,";
$sql .= " state.code_departement as state_code, state.nom as state_name,";
+
// 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.', ' : '');
}
}
+
// Add fields from hooks
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
@@ -348,13 +357,16 @@ $sql = preg_replace('/,\s*$/', '', $sql);
$sqlfields = $sql; // $sql fields to remove for count total
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+// SQL Aliase adherent
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead od d
if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
}
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = d.country)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = d.state_id)";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on (s.rowid = d.fk_soc)";
+
+// SQL Aliase adherent_type
$sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
$sql .= " WHERE d.fk_adherent_type = t.rowid";
@@ -524,8 +536,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
exit;
}
-$help_url = 'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros';
-llxHeader('', $title, $help_url);
if ($search_type > 0) {
$membertype = new AdherentType($db);
@@ -533,7 +543,11 @@ if ($search_type > 0) {
$title .= " (".$membertype->label.")";
}
+// $parameters
$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
@@ -609,6 +623,7 @@ if ($search_type > 0) {
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
+
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -635,6 +650,8 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr
$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
if ($user->hasRight('adherent', 'creer')) {
$newcardbutton .= dolGetButtonTitle($langs->trans('NewMember'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create');
}
@@ -649,6 +666,8 @@ print '';
print '';
print '';
print '';
+print '';
+
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -697,6 +716,7 @@ print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+ if (property_exists($this, 'type')) {
+ $return .= '
'.$this->type.''; + } + if (method_exists($this, 'getmorphylib')) { + $return .= '
'.$this->getmorphylib('', 2).''; + } + if (method_exists($this, 'getLibStatut')) { + $return .= '
';
+ $return .= ''.$this->type.''; + } + if (method_exists($this, 'getmorphylib')) { + $return .= '
'.$this->getmorphylib('', 2).''; + } + if (method_exists($this, 'getLibStatut')) { + $return .= '
'.$this->getLibStatut(5).'
';
+ }
+ $return .= '| '; @@ -704,6 +724,7 @@ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { print $searchpicto; print ' | '; } + // Line numbering if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) { print ''; @@ -715,32 +736,45 @@ if (!empty($arrayfields['d.ref']['checked'])) { print ''; print ''; } + +// Civility if (!empty($arrayfields['d.civility']['checked'])) { print ' | '; print ' | '; } + +// First Name if (!empty($arrayfields['d.firstname']['checked'])) { print ''; print ' | '; } + +// Last Name if (!empty($arrayfields['d.lastname']['checked'])) { print ''; print ' | '; } + +// Gender if (!empty($arrayfields['d.gender']['checked'])) { print ''; $arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother")); print $form->selectarray('search_gender', $arraygender, $search_gender, 1); print ' | '; } + +// Company if (!empty($arrayfields['d.company']['checked'])) { print ''; print ' | '; } + +// Login if (!empty($arrayfields['d.login']['checked'])) { print ''; print ' | '; } + // Nature if (!empty($arrayfields['d.morphy']['checked'])) { print ''; @@ -748,6 +782,8 @@ if (!empty($arrayfields['d.morphy']['checked'])) { print $form->selectarray('search_morphy', $arraymorphy, $search_morphy, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100'); print ' | '; } + +// Member Type if (!empty($arrayfields['t.libelle']['checked'])) { print ''; } @@ -758,51 +794,62 @@ if (!empty($arrayfields['t.libelle']['checked'])) { print ''; } +// Address - Street if (!empty($arrayfields['d.address']['checked'])) { print ''; print ' | '; } +// ZIP if (!empty($arrayfields['d.zip']['checked'])) { print ''; print ' | '; } + +// Town/City if (!empty($arrayfields['d.town']['checked'])) { print ''; print ' | '; } -// State + +// State / County / Departement if (!empty($arrayfields['state.nom']['checked'])) { print ''; print ''; print ' | '; } + // Country if (!empty($arrayfields['country.code_iso']['checked'])) { print ''; print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100'); print ' | '; } + // Phone pro if (!empty($arrayfields['d.phone']['checked'])) { print ''; print ' | '; } + // Phone perso if (!empty($arrayfields['d.phone_perso']['checked'])) { print ''; - print ' | '; + print ''; } + // Phone mobile if (!empty($arrayfields['d.phone_mobile']['checked'])) { print ''; print ' | '; } + // Email if (!empty($arrayfields['d.email']['checked'])) { print ''; print ' | '; } + // End of subscription date if (!empty($arrayfields['d.datefin']['checked'])) { print ''; @@ -811,6 +858,7 @@ if (!empty($arrayfields['d.datefin']['checked'])) { print $form->selectarray('search_filter', $selectarray, $search_filter); print ' | '; } + // Extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; @@ -818,21 +866,25 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; $parameters = array('arrayfields'=>$arrayfields); $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; + // Date creation if (!empty($arrayfields['d.datec']['checked'])) { print ''; print ' | '; } + // Birthday if (!empty($arrayfields['d.birth']['checked'])) { print ''; print ' | '; } + // Date modification if (!empty($arrayfields['d.tms']['checked'])) { print ''; print ' | '; } + // Status if (!empty($arrayfields['d.statut']['checked'])) { print ''; @@ -845,11 +897,14 @@ if (!empty($arrayfields['d.statut']['checked'])) { print $form->selectarray('search_status', $liststatus, $search_status, -3, 0, 0, '', 0, 0, 0, '', 'search_status width100 onrightofpage'); print ' | '; } + +// Import Key if (!empty($arrayfields['d.import_key']['checked'])) { print ''; print ''; print ' | '; } + if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { // Action column print ''; @@ -930,6 +985,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; $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 print $hookmanager->resPrint; + if (!empty($arrayfields['d.datec']['checked'])) { print_liste_field_titre($arrayfields['d.datec']['label'], $_SERVER["PHP_SELF"], "d.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder); } @@ -987,276 +1043,292 @@ while ($i < min($num, $limit)) { } $memberstatic->company = $companyname; - 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 ($mode == 'kanban') { + if ($i == 0) { + print ' | ||||||||||||||||||||||||||||||||
| ';
+ print ' ';
}
- print ' | ';
- }
-
- if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
- print ''.$obj->rowid.' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - - // Ref - if (!empty($arrayfields['d.ref']['checked'])) { - print ""; - print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1); - print " | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Civility - if (!empty($arrayfields['d.civility']['checked'])) { - print ""; - print $obj->civility; - print " | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Firstname - if (!empty($arrayfields['d.firstname']['checked'])) { - print ''; - print $memberstatic->getNomUrl(0, 0, 'card', 'firstname'); - //print $obj->firstname; - print " | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Lastname - if (!empty($arrayfields['d.lastname']['checked'])) { - print ''; - print $memberstatic->getNomUrl(0, 0, 'card', 'lastname'); - //print $obj->lastname; - print " | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Gender - if (!empty($arrayfields['d.gender']['checked'])) { - print ''; - if ($obj->gender) { - print $langs->trans("Gender".$obj->gender); - } - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Company - if (!empty($arrayfields['d.company']['checked'])) { - print ''; - print $companynametoshow; - print " | \n"; - } - // Login - if (!empty($arrayfields['d.login']['checked'])) { - print ''.$obj->login." | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Nature (Moral/Physical) - if (!empty($arrayfields['d.morphy']['checked'])) { - print ''; - print $memberstatic->getmorphylib('', 2); - print " | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Type label - if (!empty($arrayfields['t.libelle']['checked'])) { $membertypestatic->id = $obj->type_id; $membertypestatic->label = $obj->type; - print ''; - print $membertypestatic->getNomUrl(1, 32); - print ' | '; - if (!$i) { - $totalarray['nbfield']++; + $memberstatic->type = $membertypestatic->label; + $memberstatic->photo = $obj->photo; + // Output Kanban + print $memberstatic->getKanbanView(''); + if ($i == (min($num, $limit) - 1)) { + print ''; + print ''; - print $obj->address; - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Zip - if (!empty($arrayfields['d.zip']['checked'])) { - print ''; - print $obj->zip; - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Town - if (!empty($arrayfields['d.town']['checked'])) { - print ''; - print $obj->town; - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // State - if (!empty($arrayfields['state.nom']['checked'])) { - print "".$obj->state_name." | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Country - if (!empty($arrayfields['country.code_iso']['checked'])) { - $tmparray = getCountry($obj->country, 'all'); - print ''; - print dol_escape_htmltag($tmparray['label']); - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Phone pro - if (!empty($arrayfields['d.phone']['checked'])) { - print ''; - print $obj->phone; - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Phone perso - if (!empty($arrayfields['d.phone_perso']['checked'])) { - print ''; - print $obj->phone_perso; - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Phone mobile - if (!empty($arrayfields['d.phone_mobile']['checked'])) { - print ''; - print $obj->phone_mobile; - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // EMail - if (!empty($arrayfields['d.email']['checked'])) { - print ''; - print dol_print_email($obj->email, 0, 0, 1, 64, 1, 1); - print " | \n"; - } - // End of subscription date - $datefin = $db->jdate($obj->datefin); - if (!empty($arrayfields['d.datefin']['checked'])) { - print ''; - if ($datefin) { - print dol_print_date($datefin, 'day'); - if ($memberstatic->hasDelay()) { - $textlate = ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')'; - print " ".img_warning($langs->trans("SubscriptionLate").$textlate); + } else { + 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 ''; } - } else { - if (!empty($obj->subscription)) { - print ''.$langs->trans("SubscriptionNotReceived").''; - if ($obj->statut > 0) { - print " ".img_warning(); + print ' | '; + } + // Technical ID + if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) { + print ''.$obj->rowid.' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Ref + if (!empty($arrayfields['d.ref']['checked'])) { + print ""; + print $memberstatic->getNomUrl(-1, 0, 'card', 'ref', '', -1, 0, 1); + print " | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Civility + if (!empty($arrayfields['d.civility']['checked'])) { + print ""; + print $obj->civility; + print " | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Firstname + if (!empty($arrayfields['d.firstname']['checked'])) { + print ''; + print $memberstatic->getNomUrl(0, 0, 'card', 'firstname'); + //print $obj->firstname; + print " | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Lastname + if (!empty($arrayfields['d.lastname']['checked'])) { + print ''; + print $memberstatic->getNomUrl(0, 0, 'card', 'lastname'); + //print $obj->lastname; + print " | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Gender + if (!empty($arrayfields['d.gender']['checked'])) { + print ''; + if ($obj->gender) { + print $langs->trans("Gender".$obj->gender); + } + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Company + if (!empty($arrayfields['d.company']['checked'])) { + print ''; + print $companynametoshow; + print " | \n"; + } + // Login + if (!empty($arrayfields['d.login']['checked'])) { + print ''.$obj->login." | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Nature (Moral/Physical) + if (!empty($arrayfields['d.morphy']['checked'])) { + print ''; + print $memberstatic->getmorphylib('', 2); + print " | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Type label + if (!empty($arrayfields['t.libelle']['checked'])) { + $membertypestatic->id = $obj->type_id; + $membertypestatic->label = $obj->type; + print ''; + print $membertypestatic->getNomUrl(1, 32); + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Address + if (!empty($arrayfields['d.address']['checked'])) { + print ''; + print $obj->address; + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Zip + if (!empty($arrayfields['d.zip']['checked'])) { + print ''; + print $obj->zip; + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Town + if (!empty($arrayfields['d.town']['checked'])) { + print ''; + print $obj->town; + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // State / County / Departement + if (!empty($arrayfields['state.nom']['checked'])) { + print "".$obj->state_name." | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Country + if (!empty($arrayfields['country.code_iso']['checked'])) { + $tmparray = getCountry($obj->country, 'all'); + print ''; + print dol_escape_htmltag($tmparray['label']); + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Phone pro + if (!empty($arrayfields['d.phone']['checked'])) { + print ''; + print $obj->phone; + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Phone perso + if (!empty($arrayfields['d.phone_perso']['checked'])) { + print ''; + print $obj->phone_perso; + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Phone mobile + if (!empty($arrayfields['d.phone_mobile']['checked'])) { + print ''; + print $obj->phone_mobile; + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // EMail + if (!empty($arrayfields['d.email']['checked'])) { + print ''; + print dol_print_email($obj->email, 0, 0, 1, 64, 1, 1); + print " | \n"; + } + // End of subscription date + $datefin = $db->jdate($obj->datefin); + if (!empty($arrayfields['d.datefin']['checked'])) { + print ''; + if ($datefin) { + print dol_print_date($datefin, 'day'); + if ($memberstatic->hasDelay()) { + $textlate = ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')'; + print " ".img_warning($langs->trans("SubscriptionLate").$textlate); } } else { - print ' '; + if (!empty($obj->subscription)) { + print ''.$langs->trans("SubscriptionNotReceived").''; + if ($obj->statut > 0) { + print " ".img_warning(); + } + } else { + print ' '; + } + } + print ' | '; + } + // Extra fields + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; + // Fields from hook + $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray); + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + // Date creation + if (!empty($arrayfields['d.datec']['checked'])) { + print ''; + print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); + print ' | '; + if (!$i) { + $totalarray['nbfield']++; } } - print ''; - } - // Extra fields - include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; - // Fields from hook - $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray); - $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook - print $hookmanager->resPrint; - // Date creation - if (!empty($arrayfields['d.datec']['checked'])) { - print ''; - print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Birth - if (!empty($arrayfields['d.birth']['checked'])) { - print ''; - print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser'); - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Date modification - if (!empty($arrayfields['d.tms']['checked'])) { - print ''; - print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - // Status - if (!empty($arrayfields['d.statut']['checked'])) { - print ''; - print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5); - print ' | '; - if (!$i) { - $totalarray['nbfield']++; - } - } - if (!empty($arrayfields['d.import_key']['checked'])) { - print ''; - print dol_escape_htmltag($obj->import_key); - print " | \n"; - if (!$i) { - $totalarray['nbfield']++; - } - } - // 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($obj->rowid, $arrayofselected)) { - $selected = 1; + // Birth + if (!empty($arrayfields['d.birth']['checked'])) { + print ' | '; + print dol_print_date($db->jdate($obj->birth), 'day', 'tzuser'); + print ' | '; + if (!$i) { + $totalarray['nbfield']++; } - print ''; } - print ''; - } - if (!$i) { - $totalarray['nbfield']++; - } + // Date modification + if (!empty($arrayfields['d.tms']['checked'])) { + print ''; + print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser'); + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Status + if (!empty($arrayfields['d.statut']['checked'])) { + print ''; + print $memberstatic->LibStatut($obj->statut, $obj->subscription, $datefin, 5); + print ' | '; + if (!$i) { + $totalarray['nbfield']++; + } + } + if (!empty($arrayfields['d.import_key']['checked'])) { + print ''; + print dol_escape_htmltag($obj->import_key); + print " | \n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // 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($obj->rowid, $arrayofselected)) { + $selected = 1; + } + print ''; + } + print ' | '; + } + if (!$i) { + $totalarray['nbfield']++; + } - print '
'; + + print load_fiche_titre($langs->trans('MiscellaneousOptions'), '', ''); } + print ''; -print "
"; + +print dol_get_fiche_end(); // End of page llxFooter(); diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php index 76c717b669d..42967b4f275 100644 --- a/htdocs/admin/agenda_reminder.php +++ b/htdocs/admin/agenda_reminder.php @@ -150,7 +150,6 @@ $linkback = 'trans("Agenda"), -1, 'action'); diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 96dd7affdba..176816c0f88 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -52,7 +52,7 @@ if ($action == 'setbarcodeproducton') { $barcodenumberingmodule = GETPOST('value', 'alpha'); $res = dolibarr_set_const($db, "BARCODE_PRODUCT_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity); if ($barcodenumberingmodule == 'mod_barcode_product_standard' && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) { - $res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity); + $res = dolibarr_set_const($db, "BARCODE_STANDARD_PRODUCT_MASK", '04{0000000000}', 'chaine', 0, '', $conf->entity); } } elseif ($action == 'setbarcodeproductoff') { $res = dolibarr_del_const($db, "BARCODE_PRODUCT_ADDON_NUM", $conf->entity); @@ -62,7 +62,7 @@ if ($action == 'setbarcodethirdpartyon') { $barcodenumberingmodule = GETPOST('value', 'alpha'); $res = dolibarr_set_const($db, "BARCODE_THIRDPARTY_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity); if ($barcodenumberingmodule == 'mod_barcode_thirdparty_standard' && empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK)) { - $res = dolibarr_set_const($db, "BARCODE_STANDARD_THIRDPARTY_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity); + $res = dolibarr_set_const($db, "BARCODE_STANDARD_THIRDPARTY_MASK", '04{0000000000}', 'chaine', 0, '', $conf->entity); } } elseif ($action == 'setbarcodethirdpartyoff') { $res = dolibarr_del_const($db, "BARCODE_THIRDPARTY_ADDON_NUM", $conf->entity); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index abf62b51fa7..8b63c5842ba 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -2510,11 +2510,11 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '') print ''; } elseif ($value == 'block_if_negative') { print '
';
$moreforfilter .= $form->selectarray('search_nature', $arrayofnatures, dol_escape_htmltag($search_nature), $langs->trans('Origin'), 0, 0, '', 0, 0, 0, '', 'maxwidth250', 1);
$moreforfilter .= '
';
+
if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
$array_version = array('stable'=>$langs->transnoentitiesnoconv("Stable"));
if ($conf->global->MAIN_FEATURES_LEVEL < 0) {
@@ -559,11 +602,12 @@ if ($mode == 'common' || $mode == 'commonkanban') {
$array_version['development'] = $langs->trans("Development");
}
$moreforfilter .= '';
- $moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->trans('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+ $moreforfilter .= $form->selectarray('search_version', $array_version, $search_version, $langs->transnoentitiesnoconv('Version'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '
';
}
+ $array_status = array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled"));
$moreforfilter .= '';
- $moreforfilter .= $form->selectarray('search_status', array('active'=>$langs->transnoentitiesnoconv("Enabled"), 'disabled'=>$langs->transnoentitiesnoconv("Disabled")), $search_status, $langs->trans('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
+ $moreforfilter .= $form->selectarray('search_status', $array_status, $search_status, $langs->transnoentitiesnoconv('Status'), 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1);
$moreforfilter .= '
';
$moreforfilter .= ' ';
$moreforfilter .= '';
@@ -734,15 +778,17 @@ if ($mode == 'common' || $mode == 'commonkanban') {
// Version (with picto warning or not)
$version = $objMod->getVersion(0);
$versiontrans = '';
+ $warningstring = '';
if (preg_match('/development/i', $version)) {
- $versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+ $warningstring = $langs->trans("Development");
}
if (preg_match('/experimental/i', $version)) {
- $versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+ $warningstring = $langs->trans("Experimental");
}
if (preg_match('/deprecated/i', $version)) {
- $versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
+ $warningstring = $langs->trans("Deprecated");
}
+
if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
$versiontrans .= $objMod->getVersion(1);
}
@@ -800,12 +846,24 @@ if ($mode == 'common' || $mode == 'commonkanban') {
} else {
if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
$codeenabledisable .= 'warnings_unactivation[$mysoc->country_code]).'&value='.$modName.'&mode='.$mode.$param.'">';
- $codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
+ $codeenabledisable .= img_picto($langs->trans("Activated").($warningstring ? ' '.$warningstring : ''), 'switch_on');
$codeenabledisable .= '';
+ if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
+ $codeenabledisable .= ' ';
+ $codeenabledisable .= '';
+ $codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="opacitymedium"');
+ $codeenabledisable .= '';
+ }
} else {
$codeenabledisable .= '';
- $codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
+ $codeenabledisable .= img_picto($langs->trans("Activated").($warningstring ? ' '.$warningstring : ''), 'switch_on');
$codeenabledisable .= '';
+ if (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1) {
+ $codeenabledisable .= ' ';
+ $codeenabledisable .= '';
+ $codeenabledisable .= img_picto($langs->trans("Reload"), 'refresh', 'class="opacitymedium"');
+ $codeenabledisable .= '';
+ }
}
}
@@ -907,7 +965,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
// Output Kanban
print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
} else {
- print ''."\n";
+ print ' '."\n";
if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
print ''.$linenum.' ';
}
@@ -941,7 +999,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
print '';
// Version
- print '';
+ print ' ';
if ($objMod->needUpdate) {
$versionTitle = $langs->trans('ModuleUpdateAvailable').' : '.$objMod->lastVersion;
print ''.$versiontrans.'';
@@ -951,7 +1009,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
print " \n";
// Link enable/disable
- print '';
+ print ' ';
print $codeenabledisable;
print " \n";
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index 3c348d71a12..d8fb57b49f5 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -84,7 +84,7 @@ $tablib[1] = "Websites";
// Requests to extract data
$tabsql = array();
-$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status, f.date_creation FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
+$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.position, f.status, f.date_creation, f.lastaccess, f.pageviews_previous_month, f.pageviews_total FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')';
// Criteria to sort dictionaries
$tabsqlsort = array();
@@ -92,7 +92,7 @@ $tabsqlsort[1] = "ref ASC";
// Nom des champs en resultat de select pour affichage du dictionnaire
$tabfield = array();
-$tabfield[1] = "ref,description,virtualhost,position,date_creation";
+$tabfield[1] = "ref,description,virtualhost,position,date_creation,lastaccess,pageviews_previous_month,pageviews_total";
// Nom des champs d'edition pour modification d'un enregistrement
$tabfieldvalue = array();
@@ -186,7 +186,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
$sql .= $tabrowid[$id].",";
}
$sql .= $tabfieldinsert[$id];
- $sql .= ",status)";
+ $sql .= ", status, date_creation)";
$sql .= " VALUES(";
// List of values
@@ -211,7 +211,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
}
$i++;
}
- $sql .= ",1)";
+ $sql .= ", 1, '".$db->idate(dol_now())."')";
dol_syslog("actionadd", LOG_DEBUG);
$result = $db->query($sql);
@@ -441,12 +441,10 @@ if ($id) {
// Form to add a new line
if ($tabname[$id]) {
- $fieldlist = explode(',', $tabfield[$id]);
-
// Line for title
print ' ';
foreach ($fieldlist as $field => $value) {
- if ($fieldlist[$field] == 'date_creation') {
+ if (in_array($fieldlist[$field], array('date_creation', 'lastaccess', 'pageviews_previous_month', 'pageviews_month', 'pageviews_total'))) {
continue;
}
@@ -522,6 +520,7 @@ if ($id) {
print '';
print '';
+ print ' ';
+ $s .= ' ';
}
}
@@ -1009,9 +1011,13 @@ if ($mode == 'show_day') {
// Request only leaves for the current selected day
$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin"; // date_debut and date_fin are date without time
} elseif ($mode == 'show_week') {
- // TODO: Add filter to reduce database request
+ // Restrict on current month (we get more, but we will filter later)
+ $sql .= " AND date_debut < '".dol_get_last_day($year, $month)."'";
+ $sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
} elseif ($mode == 'show_month') {
- // TODO: Add filter to reduce database request
+ // Restrict on current month
+ $sql .= " AND date_debut <= '".dol_get_last_day($year, $month)."'";
+ $sql .= " AND date_fin >= '".dol_get_first_day($year, $month)."'";
}
$resql = $db->query($sql);
@@ -1082,8 +1088,11 @@ if (count($listofextcals)) {
$colorcal = $extcal['color'];
$buggedfile = $extcal['buggedfile'];
+ $pathforcachefile = dol_sanitizePathName($conf->user->dir_temp).'/'.dol_sanitizeFileName('extcal_'.$namecal.'_user'.$user->id).'.cache';
+ //var_dump($pathforcachefile);exit;
+
$ical = new ICal();
- $ical->parse($url);
+ $ical->parse($url, $pathforcachefile, $DELAYFORCACHE);
// After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
//var_dump($ical->cal); exit;
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 4be3195561e..ab2037d5f76 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -600,7 +600,7 @@ $num = $db->num_rows($resql);
$arrayofselected = is_array($toselect) ? $toselect : array();
// Local calendar
-$newtitle = ' \n";
$now = dol_now();
$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
+$today_start_time = dol_mktime(0, 0, 0, date('m', $now), date('d', $now), date('Y', $now));
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
$caction = new CActionComm($db);
@@ -899,6 +900,7 @@ $i = 0;
//$savnbfield = $totalarray['nbfield'];
//$totalarray['nbfield'] = 0;
$imaxinloop = ($limit ? min($num, $limit) : $num);
+$cache_user_list = array();
while ($i < $imaxinloop) {
$obj = $db->fetch_object($resql);
if (empty($obj)) {
@@ -933,7 +935,55 @@ while ($i < $imaxinloop) {
$actionstatic->fetchResources();
}
- print '';
+ // cache of user list (owners)
+ if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+ $userstatic = new User($db);
+ $res = $userstatic->fetch($obj->fk_user_action);
+ if ($res > 0) {
+ $cache_user_list[$obj->fk_user_action] = $userstatic;
+ }
+ }
+
+ // get event style for user owner
+ $event_owner_style = '';
+ // We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+ if ($cache_user_list[$obj->fk_user_action]->color != '') {
+ $event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;';
+ }
+
+ // get event style for start and end date
+ $event_more_class = '';
+ $event_start_date_css = '';
+ $event_end_date_css = '';
+ $event_start_date_time = $actionstatic->datep;
+ if ($event_start_date_time > $now) {
+ // future event
+ $event_more_class = 'event-future';
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+ } else {
+ if ($obj->fulldayevent == 1) {
+ $today_start_date_time = $today_start_time;
+ } else {
+ $today_start_date_time = $now;
+ }
+
+ // check event end date
+ $event_end_date_time = $db->jdate($obj->dp2);
+ if ($event_end_date_time != null && $event_end_date_time < $today_start_date_time) {
+ // past event
+ $event_more_class = 'event-past';
+ } elseif ($event_end_date_time == null && $event_start_date_time < $today_start_date_time) {
+ // past event
+ $event_more_class = 'event-past';
+ } else {
+ // current event
+ $event_more_class = 'event-current';
+ }
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+ }
+ $event_start_date_css = $event_end_date_css = $event_more_class;
+
+ print ' ';
// Action column
if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
print '';
@@ -955,10 +1005,16 @@ while ($i < $imaxinloop) {
// User owner
if (!empty($arrayfields['owner']['checked'])) {
- print ' '; // With edge and chrome the td overflow is not supported correctly when content is not full text.
- if ($obj->fk_user_action > 0) {
- $userstatic->fetch($obj->fk_user_action);
- print $userstatic->getNomUrl(-1);
+ print ' '; // With edge and chrome the td overflow is not supported correctly when content is not full text.
+ if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
+ $userstatic = new User($db);
+ $res = $userstatic->fetch($obj->fk_user_action);
+ if ($res > 0) {
+ $cache_user_list[$obj->fk_user_action] = $userstatic;
+ }
+ }
+ if (isset($cache_user_list[$obj->fk_user_action])) {
+ print $cache_user_list[$obj->fk_user_action]->getNomUrl(-1);
} else {
print ' ';
}
@@ -1006,13 +1062,14 @@ while ($i < $imaxinloop) {
// Start date
if (!empty($arrayfields['a.datep']['checked'])) {
- print ' ';
+ print ' ';
if (empty($obj->fulldayevent)) {
print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuserrel');
} else {
$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
print dol_print_date($db->jdate($obj->dp), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuserrel'));
}
+ print '';
$late = 0;
if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
$late = 1;
@@ -1025,13 +1082,14 @@ while ($i < $imaxinloop) {
// End date
if (!empty($arrayfields['a.datep2']['checked'])) {
- print ' ';
+ print ' ';
if (empty($obj->fulldayevent)) {
print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuserrel');
} else {
$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
print dol_print_date($db->jdate($obj->dp2), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuserrel'));
}
+ print '';
print ' ';
}
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index ce33d0f40b2..c13de5fb183 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -368,12 +368,15 @@ $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
$tmpday = $first_day;
$picto = 'calendarweek';
-$nav = "".img_previous($langs->trans("Previous"))."\n";
+// Show navigation bar
+$nav = '';
$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
$nav .= ' ';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index bd35fc16e7d..0ee3b6db4a1 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -363,13 +363,16 @@ $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year, 'gmt'));
$tmpday = $first_day;
$picto = 'calendarweek';
-$nav = "trans("Previous"))."\"> \n";
+// Show navigation bar
+$nav = '';
$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
$nav .= ' ';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 5fb464a6e8e..b8a53aadba6 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -15,6 +15,7 @@
* Copyright (C) 2018-2021 Frédéric France
* Copyright (C) 2020 Nicolas ZABOURI
* Copyright (C) 2022 Gauthier VERDOL
+ * Copyright (C) 2023 Lenin Rivas
*
* 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
@@ -938,12 +939,12 @@ if (empty($reshook)) {
$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
if ($prod_entry_mode == 'free') {
$idprod = 0;
- $tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
} else {
$idprod = GETPOST('idprod', 'int');
- $tva_tx = '';
}
+ $tva_tx = GETPOST('tva_tx', 'alpha');
+
$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS', 2);
$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
if (empty($remise_percent)) {
@@ -992,6 +993,8 @@ if (empty($reshook)) {
if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
$pu_ht = 0;
$pu_ttc = 0;
+ $pu_ht_devise = 0;
+ $pu_ttc_devise = 0;
$price_min = 0;
$price_min_ttc = 0;
$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
@@ -1002,7 +1005,6 @@ if (empty($reshook)) {
// Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit
- // Ecrase $tva_tx par celui du produit
// Replaces $fk_unit with the product unit
if (!empty($idprod) && $idprod > 0) {
$prod = new Product($db);
@@ -1011,11 +1013,11 @@ if (empty($reshook)) {
$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
// Update if prices fields are defined
- $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+ /*$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
if (empty($tva_tx)) {
$tva_npr = 0;
- }
+ }*/
// Price unique per product
$pu_ht = $prod->price;
@@ -1056,14 +1058,14 @@ if (empty($reshook)) {
$price_min = price($prodcustprice->lines[0]->price_min);
$price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
$price_base_type = $prodcustprice->lines[0]->price_base_type;
- $tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
+ /*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
}
$tva_npr = $prodcustprice->lines[0]->recuperableonly;
if (empty($tva_tx)) {
$tva_npr = 0;
- }
+ }*/
}
}
} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
@@ -1114,12 +1116,12 @@ if (empty($reshook)) {
$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
// Set unit price to use
- if (!empty($price_ht) || $price_ht === '0') {
+ if (!empty($price_ht) || (string) $price_ht === '0') {
$pu_ht = price2num($price_ht, 'MU');
- $pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
- } elseif (!empty($price_ttc) || $price_ttc === '0') {
+ $pu_ttc = price2num($pu_ht * (1 + ((float) $tmpvat / 100)), 'MU');
+ } elseif (!empty($price_ttc) || (string) $price_ttc === '0') {
$pu_ttc = price2num($price_ttc, 'MU');
- $pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+ $pu_ht = price2num($pu_ttc / (1 + ((float) $tmpvat / 100)), 'MU');
} elseif ($tmpvat != $tmpprodvat) {
// Is this still used ?
if ($price_base_type != 'HT') {
@@ -1416,12 +1418,12 @@ if (empty($reshook)) {
//var_dump(price2num($price_min_ttc)); var_dump(price2num($pu_ttc)); var_dump($remise_percent);exit;
if ($usermustrespectpricemin) {
- if ($pu_equivalent && $price_min && ((price2num($pu_equivalent) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+ if ($pu_equivalent && $price_min && ((price2num($pu_equivalent) * (1 - (float) $remise_percent / 100)) < price2num($price_min))) {
$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
setEventMessages($mesg, null, 'errors');
$error++;
$action = 'editline';
- } elseif ($pu_equivalent_ttc && $price_min_ttc && ((price2num($pu_equivalent_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+ } elseif ($pu_equivalent_ttc && $price_min_ttc && ((price2num($pu_equivalent_ttc) * (1 - (float) $remise_percent / 100)) < price2num($price_min_ttc))) {
$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
setEventMessages($mesg, null, 'errors');
$error++;
@@ -1928,7 +1930,7 @@ if ($action == 'create') {
print '';
print ''.$langs->trans('NotePublic').' ';
print '';
- $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : null));
+ $note_public = $object->getDefaultCreateValueFor('note_public', (!empty($objectsrc) ? $objectsrc->note_public : (!empty($conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT) ? $conf->global->PROPALE_ADDON_NOTE_PUBLIC_DEFAULT : null)), 'restricthtml');
$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PUBLIC) ? 0 : 1, ROWS_3, '90%');
print $doleditor->Create(1);
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 2b429d0e8d1..150e2c99b66 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -301,7 +301,7 @@ class Propal extends CommonObject
'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>40),
- 'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>23),
+ 'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'position'=>23),
'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>24),
'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
@@ -2903,7 +2903,7 @@ class Propal extends CommonObject
* @param int $offset For pagination
* @param string $sortfield Sort criteria
* @param string $sortorder Sort order
- * @return int -1 if KO, array with result if OK
+ * @return array|int -1 if KO, array with result if OK
*/
public function liste_array($shortlist = 0, $draft = 0, $notcurrentuser = 0, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'p.datep', $sortorder = 'DESC')
{
@@ -2982,8 +2982,8 @@ class Propal extends CommonObject
/**
* Returns an array with id and ref of related invoices
*
- * @param int $id Id propal
- * @return array Array of invoices id
+ * @param int $id Id propal
+ * @return array|int Array of invoices id
*/
public function InvoiceArrayList($id)
{
@@ -3914,6 +3914,41 @@ class Propal extends CommonObject
return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs;
+ $return = ' ';
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print ' ';
+ 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($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ // 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($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
}
- print '';
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['p.ref']['checked'])) {
- print '';
-
- print '
';
-
- print " \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['p.ref_client']['checked'])) {
- // Customer ref
- print '';
- print dol_escape_htmltag($obj->ref_client);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['pr.ref']['checked'])) {
- // Project ref
- print '';
- if ($obj->project_id > 0) {
- print $projectstatic->getNomUrl(1);
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['pr.title']['checked'])) {
- // Project label
- print '';
- if ($obj->project_id > 0) {
- print dol_escape_htmltag($projectstatic->title);
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Thirdparty
- if (!empty($arrayfields['s.nom']['checked'])) {
- print '';
- print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Alias
- if (!empty($arrayfields['s.name_alias']['checked'])) {
- print '';
- print $obj->alias;
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Town
- if (!empty($arrayfields['s.town']['checked'])) {
- print '';
- print $obj->town;
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Zip
- if (!empty($arrayfields['s.zip']['checked'])) {
- print '';
- print $obj->zip;
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // State
- if (!empty($arrayfields['state.nom']['checked'])) {
- print "".$obj->state_name." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Country
- if (!empty($arrayfields['country.code_iso']['checked'])) {
- print '';
- $tmparray = getCountry($obj->fk_pays, 'all');
- print $tmparray['label'];
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Type ent
- if (!empty($arrayfields['typent.code']['checked'])) {
- if (!is_array($typenArray) || empty($typenArray)) {
- $typenArray = $formcompany->typent_array(1);
- }
-
- print '';
- print $typenArray[$obj->typent_code];
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Date proposal
- if (!empty($arrayfields['p.date']['checked'])) {
- print '';
- print dol_print_date($db->jdate($obj->dp), 'day');
- print " \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Date end validity
- if (!empty($arrayfields['p.fin_validite']['checked'])) {
- if ($obj->dfv) {
- print ''.dol_print_date($db->jdate($obj->dfv), 'day');
- print ' ';
- } else {
- print ' ';
- }
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Date delivery
- if (!empty($arrayfields['p.date_livraison']['checked'])) {
- if ($obj->ddelivery) {
- print ''.dol_print_date($db->jdate($obj->ddelivery), 'day');
- print ' ';
- } else {
- print ' ';
- }
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Date Signature
- if (!empty($arrayfields['p.date_signature']['checked'])) {
- if ($obj->dsignature) {
- print ''.dol_print_date($db->jdate($obj->dsignature), 'day');
- print ' ';
- } else {
- print ' ';
- }
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Availability
- if (!empty($arrayfields['ava.rowid']['checked'])) {
- print '';
- $form->form_availability('', $obj->availability, 'none', 1);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Shipping Method
- if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
- print '';
- $form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Source - input reason
- if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
- print '';
- if ($obj->fk_input_reason > 0) {
- print $form->cache_demand_reason[$obj->fk_input_reason]['label'];
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Payment terms
- if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
- print '';
- $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Payment mode
- if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
- print '';
- $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Amount HT
- if (!empty($arrayfields['p.total_ht']['checked'])) {
- print ''.price($obj->total_ht)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
- }
- if (empty($totalarray['val']['p.total_ht'])) {
- $totalarray['val']['p.total_ht'] = $obj->total_ht;
- } else {
- $totalarray['val']['p.total_ht'] += $obj->total_ht;
- }
- }
- // Amount VAT
- if (!empty($arrayfields['p.total_tva']['checked'])) {
- print ''.price($obj->total_tva)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
- }
- if (empty($totalarray['val']['p.total_tva'])) {
- $totalarray['val']['p.total_tva'] = $obj->total_tva;
- } else {
- $totalarray['val']['p.total_tva'] += $obj->total_tva;
- }
- }
- // Amount TTC
- if (!empty($arrayfields['p.total_ttc']['checked'])) {
- print ''.price($obj->total_ttc)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
- }
- if (empty($totalarray['val']['p.total_ttc'])) {
- $totalarray['val']['p.total_ttc'] = $obj->total_ttc;
- } else {
- $totalarray['val']['p.total_ttc'] += $obj->total_ttc;
- }
- }
- // Amount invoiced HT
- if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
- print ''.price($totalInvoicedHT)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
- }
- if (empty($totalarray['val']['p.total_ht_invoiced'])) {
- $totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
- } else {
- $totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
- }
- }
- // Amount invoiced TTC
- if (!empty($arrayfields['p.total_invoiced']['checked'])) {
- print ''.price($totalInvoicedTTC)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
- }
- if (empty($totalarray['val']['p.total_invoiced'])) {
- $totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
- } else {
- $totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
- }
- }
- // Currency
- if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
- print ''.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Currency rate
- if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
- print '';
- $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
- print " \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Amount HT
- if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
- print ''.price($obj->multicurrency_total_ht)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Amount VAT
- if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
- print ''.price($obj->multicurrency_total_tva)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Amount TTC
- if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
- print ''.price($obj->multicurrency_total_ttc)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Amount invoiced
- if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
- print ''.price($multicurrency_totalInvoicedHT)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Amount invoiced
- if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
- print ''.price($multicurrency_totalInvoicedTTC)." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- $userstatic->id = $obj->fk_user_author;
- $userstatic->login = $obj->login;
- $userstatic->lastname = $obj->lastname;
- $userstatic->firstname = $obj->firstname;
- $userstatic->email = $obj->user_email;
- $userstatic->statut = $obj->user_statut;
- $userstatic->entity = $obj->user_entity;
- $userstatic->photo = $obj->photo;
- $userstatic->office_phone = $obj->office_phone;
- $userstatic->office_fax = $obj->office_fax;
- $userstatic->user_mobile = $obj->user_mobile;
- $userstatic->job = $obj->job;
- $userstatic->gender = $obj->gender;
-
- // Author
- if (!empty($arrayfields['u.login']['checked'])) {
- print '';
- if ($userstatic->id) {
- print $userstatic->getNomUrl(-1);
- }
- print " \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['sale_representative']['checked'])) {
- // Sales representatives
- print '';
- if ($obj->socid > 0) {
- $listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
- if ($listsalesrepresentatives < 0) {
- dol_print_error($db);
+ if (!$i) {
+ $totalarray['nbfield']++;
}
- $nbofsalesrepresentative = count($listsalesrepresentatives);
- if ($nbofsalesrepresentative > 6) {
- // We print only number
- print $nbofsalesrepresentative;
- } elseif ($nbofsalesrepresentative > 0) {
- $userstatic = new User($db);
- $j = 0;
- foreach ($listsalesrepresentatives as $val) {
- $userstatic->id = $val['id'];
- $userstatic->lastname = $val['lastname'];
- $userstatic->firstname = $val['firstname'];
- $userstatic->email = $val['email'];
- $userstatic->statut = $val['statut'];
- $userstatic->entity = $val['entity'];
- $userstatic->photo = $val['photo'];
- $userstatic->login = $val['login'];
- $userstatic->office_phone = $val['office_phone'];
- $userstatic->office_fax = $val['office_fax'];
- $userstatic->user_mobile = $val['user_mobile'];
- $userstatic->job = $val['job'];
- $userstatic->gender = $val['gender'];
- //print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Total buying or cost price
- if (!empty($arrayfields['total_pa']['checked'])) {
- print ''.price($marginInfo['pa_total']).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Total margin
- if (!empty($arrayfields['total_margin']['checked'])) {
- print ''.price($marginInfo['total_margin']).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
- }
- $totalarray['val']['total_margin'] = $total_margin;
- }
- // Total margin rate
- if (!empty($arrayfields['total_margin_rate']['checked'])) {
- print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Total mark rate
- if (!empty($arrayfields['total_mark_rate']['checked'])) {
- print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
- }
- if ($i >= $imaxinloop - 1) {
- if (!empty($total_ht)) {
- $totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
- } else {
- $totalarray['val']['total_mark_rate'] = '';
+ // Extra fields
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+ // Fields from hook
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ // Date creation
+ if (!empty($arrayfields['p.datec']['checked'])) {
+ print '';
+ print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
}
}
- }
-
- // Extra fields
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- // Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- // Date creation
- if (!empty($arrayfields['p.datec']['checked'])) {
- print '';
- print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Date modification
- if (!empty($arrayfields['p.tms']['checked'])) {
- print '';
- print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Date cloture
- if (!empty($arrayfields['p.date_cloture']['checked'])) {
- print '';
- print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Note public
- if (!empty($arrayfields['p.note_public']['checked'])) {
- print '';
- print dol_string_nohtmltag($obj->note_public);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Note private
- if (!empty($arrayfields['p.note_private']['checked'])) {
- print '';
- print dol_string_nohtmltag($obj->note_private);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Status
- if (!empty($arrayfields['p.fk_statut']['checked'])) {
- print ''.$objectstatic->getLibStatut(5).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // 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($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ // Date modification
+ if (!empty($arrayfields['p.tms']['checked'])) {
+ print ' ';
+ print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
}
- print '';
}
- print '';
- if (!$i) {
- $totalarray['nbfield']++;
+ // Date cloture
+ if (!empty($arrayfields['p.date_cloture']['checked'])) {
+ print '';
+ print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
+ // Note public
+ if (!empty($arrayfields['p.note_public']['checked'])) {
+ print '';
+ print dol_string_nohtmltag($obj->note_public);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Note private
+ if (!empty($arrayfields['p.note_private']['checked'])) {
+ print '';
+ print dol_string_nohtmltag($obj->note_private);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Status
+ if (!empty($arrayfields['p.fk_statut']['checked'])) {
+ print ''.$objectstatic->getLibStatut(5).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // 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($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+
+ print ' '."\n";
}
-
- print ' '."\n";
-
$i++;
}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index ccf706c9ac7..c2ab4fcd3bc 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -676,12 +676,11 @@ if (empty($reshook)) {
$prod_entry_mode = GETPOST('prod_entry_mode', 'aZ09');
if ($prod_entry_mode == 'free') {
$idprod = 0;
- $tva_tx = (GETPOST('tva_tx', 'alpha') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx', 'alpha'))) : 0);
} else {
$idprod = GETPOST('idprod', 'int');
- $tva_tx = '';
}
+ $tva_tx = GETPOST('tva_tx', 'alpha');
// Prepare a price equivalent for minimum price check
$pu_equivalent = $pu_ht;
@@ -762,7 +761,6 @@ if (empty($reshook)) {
// Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit
- // Ecrase $tva_tx par celui du produit
// Ecrase $base_price_type par celui du produit
if (!empty($idprod) && $idprod > 0) {
$prod = new Product($db);
@@ -771,11 +769,11 @@ if (empty($reshook)) {
$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
// Update if prices fields are defined
- $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+ /*$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
if (empty($tva_tx)) {
$tva_npr = 0;
- }
+ }*/
$pu_ht = $prod->price;
$pu_ttc = $prod->price_ttc;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 29f990476ed..9b987cb603c 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -306,7 +306,7 @@ class Commande extends CommonOrder
'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>25),
'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>26),
'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>28),
- 'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
+ 'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'isModEnabled("societe")', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>25),
'date_commande' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>1, 'position'=>60),
'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
@@ -4597,6 +4597,9 @@ class OrderLine extends CommonOrderLine
if (empty($this->remise_percent)) {
$this->remise_percent = 0;
}
+ if (empty($this->remise)) {
+ $this->remise = 0;
+ }
if (empty($this->info_bits)) {
$this->info_bits = 0;
}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 98d2b59d6a3..4fb5582e187 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -1526,16 +1526,16 @@ if ($resql) {
}
// Town
if (!empty($arrayfields['s.town']['checked'])) {
- print '';
- print '';
+ print '';
print ' ';
}
// Country
@@ -1723,18 +1723,18 @@ if ($resql) {
}
// Status billed
if (!empty($arrayfields['c.facture']['checked'])) {
- print '';
+ print ' ';
print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
print ' ';
}
// Import key
if (!empty($arrayfields['c.import_key']['checked'])) {
- print '';
+ print ' ';
print ' ';
}
// Status
if (!empty($arrayfields['c.fk_statut']['checked'])) {
- print '';
+ print ' ';
$liststatus = array(
Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
@@ -1907,7 +1907,7 @@ if ($resql) {
print_liste_field_titre($arrayfields['c.import_key']['label'], $_SERVER["PHP_SELF"], "c.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
}
if (!empty($arrayfields['c.fk_statut']['checked'])) {
- print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+ print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
}
if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
@@ -2623,7 +2623,7 @@ if ($resql) {
// Import key
if (!empty($arrayfields['c.import_key']['checked'])) {
- print ' '.$obj->import_key.' ';
+ print ''.dol_escape_htmltag($obj->import_key).' ';
if (!$i) {
$totalarray['nbfield']++;
}
@@ -2631,7 +2631,7 @@ if ($resql) {
// Status
if (!empty($arrayfields['c.fk_statut']['checked'])) {
- print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).' ';
+ print ''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).' ';
if (!$i) {
$totalarray['nbfield']++;
}
diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php
index fd36f229e5c..2ef2d429900 100644
--- a/htdocs/commande/list_det.php
+++ b/htdocs/commande/list_det.php
@@ -793,6 +793,15 @@ if ($resql) {
if ($search_fk_input_reason > 0) {
$param .= '&search_fk_input_reason='.urlencode($search_fk_input_reason);
}
+ if (!empty($productobuy)) {
+ $param .= '&productobuy='.urlencode($productobuy);
+ }
+ if (!empty($productonly)) {
+ $param .= '&productonly='.urlencode($productonly);
+ }
+ if (!empty($disablelinefree)) {
+ $param .= '&disablelinefree='.urlencode($disablelinefree);
+ }
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -830,10 +839,6 @@ if ($resql) {
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'order', 0, $newcardbutton, '', $limit, 0, 0, 1);
- print '';
- print '';
- print '';
-
$topicmail = "SendOrderRef";
$modelmail = "order_send";
$objecttmp = new Commande($db);
@@ -849,6 +854,11 @@ if ($resql) {
$moreforfilter = '';
+ $moreforfilter .= '';
+ $moreforfilter .= '';
+ $moreforfilter .= '';
+ $moreforfilter .= '
'; + // If the user can view prospects other than his' if ($user->rights->user->user->lire) { $langs->load("commercial"); @@ -888,6 +898,8 @@ if ($resql) { $moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
';
}
+
+
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
if (empty($reshook)) {
@@ -1402,6 +1414,7 @@ if ($resql) {
$total_ht = 0;
$total_margin = 0;
+
// Détail commande
$totalqty = 0;
@@ -1419,6 +1432,15 @@ if ($resql) {
$text_warning = '';
$nbprod = 0;
+ // Print SubTotal
+ if (empty($i)) {
+ $oldref = $obj->product_ref;
+ }
+ if ($oldref != $obj->product_ref) {
+ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+ $oldref = $obj->product_ref;
+ }
+
$companystatic->id = $obj->socid;
$companystatic->name = $obj->name;
$companystatic->name_alias = $obj->alias;
@@ -1509,10 +1531,7 @@ if ($resql) {
}
// Product QtyOrdered
if (!empty($arrayfields['cdet.qty']['checked'])) {
- print '';
print '';
// Title of lines
@@ -533,6 +532,10 @@ if ($id) {
$align = "left";
$sortable = 1;
$valuetoshow = '';
+ if (in_array($fieldlist[$field], array('pageviews_total', 'pageviews_previous_month'))) {
+ $align = 'right';
+ }
+
/*
$tmparray=getLabelOfField($fieldlist[$field]);
$showfield=$tmp['showfield'];
@@ -554,14 +557,24 @@ if ($id) {
if ($fieldlist[$field] == 'date_creation') {
$valuetoshow = $langs->trans("DateCreation");
}
+ if ($fieldlist[$field] == 'lastaccess') {
+ $valuetoshow = $langs->trans("LastAccess");
+ }
+ if ($fieldlist[$field] == 'pageviews_previous_month') {
+ $valuetoshow = $langs->trans("PagesViewedPreviousMonth");
+ }
+ if ($fieldlist[$field] == 'pageviews_total') {
+ $valuetoshow = $langs->trans("PagesViewedTotal");
+ }
// Affiche nom du champ
if ($showfield) {
- print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
+ print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", '', $sortfield, $sortorder, $align.' ');
}
}
- print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", 'align="center"', $sortfield, $sortorder);
+ // Status
+ print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", '', $sortfield, $sortorder, 'center ');
print getTitleFieldOfList('');
print getTitleFieldOfList('');
print '';
@@ -581,8 +594,9 @@ if ($id) {
fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
}
- print '
';
+ print '
';
print '';
}
@@ -668,6 +687,10 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
$formadmin = new FormAdmin($db);
foreach ($fieldlist as $field => $value) {
+ if (in_array($fieldlist[$field], array('lastaccess', 'pageviews_previous_month', 'pageviews_month', 'pageviews_total'))) {
+ continue;
+ }
+
$fieldname = $fieldlist[$field];
if ($fieldlist[$field] == 'lang') {
diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php
index f885677225e..37b7b079716 100644
--- a/htdocs/api/class/api_access.class.php
+++ b/htdocs/api/class/api_access.class.php
@@ -142,12 +142,28 @@ class DolibarrApiAccess implements iAuthenticate
if (!$login) {
throw new RestException(503, 'Error when searching login user from api key');
}
+
+ $genericmessageerroruser = 'Error user not valid (not found or bad status or bad validity dates) (conf->entity='.$conf->entity.')';
+
$fuser = new User($this->db);
$result = $fuser->fetch('', $login, '', 0, (empty($userentity) ? -1 : $conf->entity)); // If user is not entity 0, we search in working entity $conf->entity (that may have been forced to a different value than user entity)
if ($result <= 0) {
- throw new RestException(503, 'Error when fetching user :'.$fuser->error.' (conf->entity='.$conf->entity.')');
+ throw new RestException(503, $genericmessageerroruser);
}
+ $now = dol_now();
+
+ // Check date start validity
+ if ($fuser->datestartvalidity && $this->db->jdate($fuser->datestartvalidity) > $now) {
+ throw new RestException(503, $genericmessageerroruser);
+ }
+ // Check date end validity
+ if ($fuser->dateendvalidity && $this->db->jdate($fuser->dateendvalidity) < dol_get_first_hour($now)) {
+ throw new RestException(503, $genericmessageerroruser);
+ }
+
+
+ // User seems valid
$fuser->getrights();
// Set the property $user to the $user of API
diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php
index d5362f4ac56..0b8d3e64828 100644
--- a/htdocs/api/class/api_login.class.php
+++ b/htdocs/api/class/api_login.class.php
@@ -121,6 +121,9 @@ class Login
include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$login = checkLoginPassEntity($login, $password, $entity, $authmode, 'api'); // Check credentials.
+ if ($login === '--bad-login-validity--') {
+ $login = '';
+ }
if (empty($login)) {
throw new RestException(403, 'Access denied');
}
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index ba195b82c08..4e4da2c94cc 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -389,13 +389,13 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
$usecompression = (empty($conf->global->API_DISABLE_COMPRESSION) && !empty($_SERVER['HTTP_ACCEPT_ENCODING']));
$foundonealgorithm = 0;
if ($usecompression) {
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress')) {
$foundonealgorithm++;
}
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
$foundonealgorithm++;
}
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
$foundonealgorithm++;
}
if (!$foundonealgorithm) {
@@ -413,13 +413,13 @@ $result = $api->r->handle();
if (Luracast\Restler\Defaults::$returnResponse) {
// We try to compress the data received data
- if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && is_callable('brotli_compress') && defined('BROTLI_TEXT')) {
+ if (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'br') !== false && function_exists('brotli_compress') && defined('BROTLI_TEXT')) {
header('Content-Encoding: br');
$result = brotli_compress($result, 11, constant('BROTLI_TEXT'));
- } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && is_callable('bzcompress')) {
+ } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'bz') !== false && function_exists('bzcompress')) {
header('Content-Encoding: bz');
$result = bzcompress($result, 9);
- } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && is_callable('gzencode')) {
+ } elseif (strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') !== false && function_exists('gzencode')) {
header('Content-Encoding: gzip');
$result = gzencode($result, 9);
} else {
diff --git a/htdocs/bookcal/class/booking.class.php b/htdocs/bookcal/class/booking.class.php
index 98cb5077844..1a4f402626b 100644
--- a/htdocs/bookcal/class/booking.class.php
+++ b/htdocs/bookcal/class/booking.class.php
@@ -104,7 +104,7 @@ class Booking extends CommonObject
public $fields=array(
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1.2, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
- 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
+ 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'isModEnabled("societe")', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'validate'=>'1',),
'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index badd5db5c98..26db2cd5e6e 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -54,8 +54,8 @@ class ICal
/**
* Read text file, icalender text file
*
- * @param string $file File
- * @return string
+ * @param string $file File
+ * @return string|null Content of remote file read or null if error
*/
public function read_file($file)
{
@@ -65,7 +65,7 @@ class ICal
$tmpresult = getURLContent($file, 'GET');
if ($tmpresult['http_code'] != 200) {
- $file_text = '';
+ $file_text = null;
$this->error = 'Error: '.$tmpresult['http_code'].' '.$tmpresult['content'];
} else {
$file_text = preg_replace("/[\r\n]{1,} /", "", $tmpresult['content']);
@@ -102,17 +102,40 @@ class ICal
/**
* Translate Calendar
*
- * @param string $uri Url
+ * @param string $uri Url
+ * @param string $usecachefile Full path of a cache file to use a cache file
+ * @param string $delaycache Delay in seconds for cache (by default 3600 secondes)
* @return array|string
*/
- public function parse($uri)
+ public function parse($uri, $usecachefile = '', $delaycache = 3600)
{
$this->cal = array(); // new empty array
$this->event_count = -1;
+ $this->file_text = null;
+
+ // Save file into a cache
+ if ($usecachefile) {
+ include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+ $datefile = dol_filemtime($usecachefile);
+ $now = dol_now('gmt');
+ //print $datefile.' '.$now.' ...';
+ if ($datefile && $datefile > ($now - $delaycache)) {
+ // We reuse the cache file
+ $this->file_text = file_get_contents($usecachefile);
+ }
+ }
// read FILE text
- $this->file_text = $this->read_file($uri);
+ if (is_null($this->file_text)) {
+ $this->file_text = $this->read_file($uri);
+
+ if ($usecachefile && !is_null($this->file_text)) {
+ // Save the file content into cache file
+ file_put_contents($usecachefile, $this->file_text, LOCK_EX);
+ dolChmod($usecachefile);
+ }
+ }
$this->file_text = preg_split("[\n]", $this->file_text);
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 5b51d48392b..8ec011f5e9d 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -49,6 +49,7 @@ if (empty($conf->global->AGENDA_EXT_NB)) {
$conf->global->AGENDA_EXT_NB = 5;
}
$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
+$DELAYFORCACHE = 300; // 300 seconds
$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
@@ -299,6 +300,7 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
$enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
$default = 'AGENDA_EXT_ACTIVEBYDEFAULT_'.$user->id.'_'.$i;
$buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
+
if (getDolUserString($source) && getDolUserString($name)) {
// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
$listofextcals[] = array(
@@ -427,36 +429,33 @@ if ($mode == 'show_day' || $mode == 'show_week' || $mode == 'show_month') {
}
// Show navigation bar
+$nav = '';
+$nav .= '';
$nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
//$nav .= ' ';
@@ -495,7 +494,8 @@ print '';
//print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, $listofextcals, $actioncode, $usergroup, '', $resourceid);
//print dol_get_fiche_end();
-$viewmode = '';
+$viewmode = '';
+
$viewmode .= ''; // To add a space before the navigation tools
@@ -614,7 +616,7 @@ if (!empty($conf->use_javascript_ajax)) { // If javascript on
$default = '';
}
- $s .= '| '; - print ' | '; + print ''; + print ''; + print ' | '; } else { $tmpaction = 'view'; $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]); @@ -593,13 +607,16 @@ if ($id) { if (empty($reshook)) { foreach ($fieldlist as $field => $value) { $showfield = 1; - $align = "left"; $fieldname = $fieldlist[$field]; + $align = "left"; + if (in_array($fieldname, array('pageviews_total', 'pageviews_previous_month'))) { + $align = 'right'; + } $valuetoshow = $obj->$fieldname; // Show value for field if ($showfield) { - print ''.$valuetoshow.' | '; + print ''.$valuetoshow.' | '; } } } @@ -612,9 +629,10 @@ if ($id) { $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&'; + // Active print ''; - print ''.$actl[($obj->status ? 1 : 0)].''; + print ''.$actl[($obj->status ? 1 : 0)].''; print " | "; // Modify link @@ -633,6 +651,7 @@ if ($id) { } print '
';
+$newtitle = '
';
$newtitle .= ' '.$langs->trans("LocalAgenda").' ';
$newtitle .= '
';
//$newtitle=$langs->trans($title);
@@ -887,6 +887,7 @@ print "';
+ $return .= '
';
+ return $return;
+ }
}
/**
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 0acc2ae4bd9..cc5872abb25 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -70,6 +70,7 @@ $show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'proposallist';
+$mode = GETPOST('mode', 'alpha');
$search_user = GETPOST('search_user', 'int');
$search_sale = GETPOST('search_sale', 'int');
@@ -864,6 +865,9 @@ if ($resql) {
}
$param = '&search_status='.urlencode($search_status);
+ if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+ }
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
@@ -1072,6 +1076,9 @@ if ($resql) {
if (!empty($socid)) {
$url .= '&socid='.$socid;
}
+ $newcardbutton = '';
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
$newcardbutton = dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->rights->propal->creer);
// Fields title search
@@ -1085,6 +1092,7 @@ if ($resql) {
print '';
print '';
print '';
+ print '';
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'propal', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -1702,574 +1710,590 @@ if ($resql) {
$total_margin += $marginInfo['total_margin'];
}
- print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+ if (property_exists($this, 'fk_project')) {
+ $return .= ' | '.$this->fk_project.'';
+ }
+ if (property_exists($this, 'author')) {
+ $return .= '
'.$this->author.''; + } + if (property_exists($this, 'total_ht')) { + $return .='
'.$langs->trans("AmountHT").' : '.price($this->total_ht).''; + } + if (method_exists($this, 'getLibStatut')) { + $return .= '
';
+ $return .= ''.$this->author.''; + } + if (property_exists($this, 'total_ht')) { + $return .='
'.$langs->trans("AmountHT").' : '.price($this->total_ht).''; + } + if (method_exists($this, 'getLibStatut')) { + $return .= '
'.$this->getLibStatut(5).'
';
+ }
+ $return .= '';
+ }
+ // Output Kanban
+ $userstatic->fetch($obj->fk_user_author);
+ $objectstatic->author = $userstatic->getNomUrl(1);
+ $objectstatic->fk_project = $projectstatic->getNomUrl(1);
+ print $objectstatic->getKanbanView('');
+ if ($i == (min($num, $limit) - 1)) {
+ print '
';
+ print '| '; - print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1)); - print ' | '; - // Warning - $warnornote = ''; - if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) { - $warnornote .= img_warning($langs->trans("Late")); - } - if ($warnornote) { - print ''; - print $warnornote; print ' | '; - } - // Other picto tool - print ''; - $filename = dol_sanitizeFileName($obj->ref); - $filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref); - $urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid; - print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); - print ' |
':
- print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
- $j++;
- if ($j < $nbofsalesrepresentative) {
- print ' ';
+ }
+
+ if (!empty($arrayfields['p.ref']['checked'])) {
+ print '';
+
+ print '
';
+
+ print " \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ if (!empty($arrayfields['p.ref_client']['checked'])) {
+ // Customer ref
+ print '';
+ print dol_escape_htmltag($obj->ref_client);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ if (!empty($arrayfields['pr.ref']['checked'])) {
+ // Project ref
+ print '';
+ if ($obj->project_id > 0) {
+ print $projectstatic->getNomUrl(1);
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ if (!empty($arrayfields['pr.title']['checked'])) {
+ // Project label
+ print '';
+ if ($obj->project_id > 0) {
+ print dol_escape_htmltag($projectstatic->title);
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Thirdparty
+ if (!empty($arrayfields['s.nom']['checked'])) {
+ print '';
+ print $companystatic->getNomUrl(1, 'customer', 0, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Alias
+ if (!empty($arrayfields['s.name_alias']['checked'])) {
+ print '';
+ print $obj->alias;
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Town
+ if (!empty($arrayfields['s.town']['checked'])) {
+ print '';
+ print $obj->town;
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Zip
+ if (!empty($arrayfields['s.zip']['checked'])) {
+ print '';
+ print $obj->zip;
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // State
+ if (!empty($arrayfields['state.nom']['checked'])) {
+ print "".$obj->state_name." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Country
+ if (!empty($arrayfields['country.code_iso']['checked'])) {
+ print '';
+ $tmparray = getCountry($obj->fk_pays, 'all');
+ print $tmparray['label'];
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Type ent
+ if (!empty($arrayfields['typent.code']['checked'])) {
+ if (!is_array($typenArray) || empty($typenArray)) {
+ $typenArray = $formcompany->typent_array(1);
+ }
+
+ print '';
+ print $typenArray[$obj->typent_code];
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Date proposal
+ if (!empty($arrayfields['p.date']['checked'])) {
+ print '';
+ print dol_print_date($db->jdate($obj->dp), 'day');
+ print " \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Date end validity
+ if (!empty($arrayfields['p.fin_validite']['checked'])) {
+ if ($obj->dfv) {
+ print ''.dol_print_date($db->jdate($obj->dfv), 'day');
+ print ' ';
+ } else {
+ print ' ';
+ }
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Date delivery
+ if (!empty($arrayfields['p.date_livraison']['checked'])) {
+ if ($obj->ddelivery) {
+ print ''.dol_print_date($db->jdate($obj->ddelivery), 'day');
+ print ' ';
+ } else {
+ print ' ';
+ }
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Date Signature
+ if (!empty($arrayfields['p.date_signature']['checked'])) {
+ if ($obj->dsignature) {
+ print ''.dol_print_date($db->jdate($obj->dsignature), 'day');
+ print ' ';
+ } else {
+ print ' ';
+ }
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Availability
+ if (!empty($arrayfields['ava.rowid']['checked'])) {
+ print '';
+ $form->form_availability('', $obj->availability, 'none', 1);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Shipping Method
+ if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+ print '';
+ $form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Source - input reason
+ if (!empty($arrayfields['p.fk_input_reason']['checked'])) {
+ print '';
+ if ($obj->fk_input_reason > 0) {
+ print $form->cache_demand_reason[$obj->fk_input_reason]['label'];
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Payment terms
+ if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+ print '';
+ $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Payment mode
+ if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+ print '';
+ $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Amount HT
+ if (!empty($arrayfields['p.total_ht']['checked'])) {
+ print ''.price($obj->total_ht)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
+ }
+ if (empty($totalarray['val']['p.total_ht'])) {
+ $totalarray['val']['p.total_ht'] = $obj->total_ht;
+ } else {
+ $totalarray['val']['p.total_ht'] += $obj->total_ht;
+ }
+ }
+ // Amount VAT
+ if (!empty($arrayfields['p.total_tva']['checked'])) {
+ print ''.price($obj->total_tva)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
+ }
+ if (empty($totalarray['val']['p.total_tva'])) {
+ $totalarray['val']['p.total_tva'] = $obj->total_tva;
+ } else {
+ $totalarray['val']['p.total_tva'] += $obj->total_tva;
+ }
+ }
+ // Amount TTC
+ if (!empty($arrayfields['p.total_ttc']['checked'])) {
+ print ''.price($obj->total_ttc)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
+ }
+ if (empty($totalarray['val']['p.total_ttc'])) {
+ $totalarray['val']['p.total_ttc'] = $obj->total_ttc;
+ } else {
+ $totalarray['val']['p.total_ttc'] += $obj->total_ttc;
+ }
+ }
+ // Amount invoiced HT
+ if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+ print ''.price($totalInvoicedHT)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
+ }
+ if (empty($totalarray['val']['p.total_ht_invoiced'])) {
+ $totalarray['val']['p.total_ht_invoiced'] = $totalInvoicedHT;
+ } else {
+ $totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
+ }
+ }
+ // Amount invoiced TTC
+ if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+ print ''.price($totalInvoicedTTC)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
+ }
+ if (empty($totalarray['val']['p.total_invoiced'])) {
+ $totalarray['val']['p.total_invoiced'] = $totalInvoicedTTC;
+ } else {
+ $totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
+ }
+ }
+ // Currency
+ if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+ print ''.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Currency rate
+ if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+ print '';
+ $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+ print " \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Amount HT
+ if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+ print ''.price($obj->multicurrency_total_ht)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Amount VAT
+ if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+ print ''.price($obj->multicurrency_total_tva)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Amount TTC
+ if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+ print ''.price($obj->multicurrency_total_ttc)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Amount invoiced
+ if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+ print ''.price($multicurrency_totalInvoicedHT)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Amount invoiced
+ if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+ print ''.price($multicurrency_totalInvoicedTTC)." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ $userstatic->id = $obj->fk_user_author;
+ $userstatic->login = $obj->login;
+ $userstatic->lastname = $obj->lastname;
+ $userstatic->firstname = $obj->firstname;
+ $userstatic->email = $obj->user_email;
+ $userstatic->statut = $obj->user_statut;
+ $userstatic->entity = $obj->user_entity;
+ $userstatic->photo = $obj->photo;
+ $userstatic->office_phone = $obj->office_phone;
+ $userstatic->office_fax = $obj->office_fax;
+ $userstatic->user_mobile = $obj->user_mobile;
+ $userstatic->job = $obj->job;
+ $userstatic->gender = $obj->gender;
+
+ // Author
+ if (!empty($arrayfields['u.login']['checked'])) {
+ print '';
+ if ($userstatic->id) {
+ print $userstatic->getNomUrl(-1);
+ }
+ print " \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ if (!empty($arrayfields['sale_representative']['checked'])) {
+ // Sales representatives
+ print '';
+ if ($obj->socid > 0) {
+ $listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
+ if ($listsalesrepresentatives < 0) {
+ dol_print_error($db);
+ }
+ $nbofsalesrepresentative = count($listsalesrepresentatives);
+ if ($nbofsalesrepresentative > 6) {
+ // We print only number
+ print $nbofsalesrepresentative;
+ } elseif ($nbofsalesrepresentative > 0) {
+ $userstatic = new User($db);
+ $j = 0;
+ foreach ($listsalesrepresentatives as $val) {
+ $userstatic->id = $val['id'];
+ $userstatic->lastname = $val['lastname'];
+ $userstatic->firstname = $val['firstname'];
+ $userstatic->email = $val['email'];
+ $userstatic->statut = $val['statut'];
+ $userstatic->entity = $val['entity'];
+ $userstatic->photo = $val['photo'];
+ $userstatic->login = $val['login'];
+ $userstatic->office_phone = $val['office_phone'];
+ $userstatic->office_fax = $val['office_fax'];
+ $userstatic->user_mobile = $val['user_mobile'];
+ $userstatic->job = $val['job'];
+ $userstatic->gender = $val['gender'];
+ //print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Total buying or cost price
+ if (!empty($arrayfields['total_pa']['checked'])) {
+ print ''.price($marginInfo['pa_total']).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Total margin
+ if (!empty($arrayfields['total_margin']['checked'])) {
+ print ''.price($marginInfo['total_margin']).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+ }
+ $totalarray['val']['total_margin'] = $total_margin;
+ }
+ // Total margin rate
+ if (!empty($arrayfields['total_margin_rate']['checked'])) {
+ print ''.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Total mark rate
+ if (!empty($arrayfields['total_mark_rate']['checked'])) {
+ print ''.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+ }
+ if ($i >= $imaxinloop - 1) {
+ if (!empty($total_ht)) {
+ $totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+ } else {
+ $totalarray['val']['total_mark_rate'] = '';
}
}
- //else print $langs->trans("NoSalesRepresentativeAffected");
- } else {
- print ' ';
}
- print '
| '; + print $objectstatic->getNomUrl(1, '', '', 0, 1, (isset($conf->global->PROPAL_LIST_SHOW_NOTES) ? $conf->global->PROPAL_LIST_SHOW_NOTES : 1)); + print ' | '; + // Warning + $warnornote = ''; + if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) { + $warnornote .= img_warning($langs->trans("Late")); + } + if ($warnornote) { + print ''; + print $warnornote; + print ' | '; + } + // Other picto tool + print ''; + $filename = dol_sanitizeFileName($obj->ref); + $filedir = $conf->propal->multidir_output[$obj->propal_entity].'/'.dol_sanitizeFileName($obj->ref); + $urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid; + print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir); + print ' |
':
+ print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+ $j++;
+ if ($j < $nbofsalesrepresentative) {
+ print ' ';
+ }
+ //print '
';
}
- //print '';
+ }
+ //else print $langs->trans("NoSalesRepresentativeAffected");
+ } else {
+ print ' ';
+ }
+ print ''; + // If the user can view prospects other than his' if ($user->rights->user->user->lire) { $langs->load("commercial"); @@ -888,6 +898,8 @@ if ($resql) { $moreforfilter .= img_picto($tmptitle, 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1, 0, 0, $tmptitle, 0, 0, array(), 'maxwidth250 widthcentpercentminusx'); $moreforfilter .= '
';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 3d07c280559..857b49d1576 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -768,4 +768,41 @@ class PaymentVarious extends CommonObject
}
return 0;
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs;
+ $return = '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+
+ if (property_exists($this, 'type_lib')) {
+ $return .= '
'.substr($this->type_lib[$this->type], 0, 24).'...'; + } + if (method_exists($this, 'solde')) { + $return .= '
'; + $return .= ''.$langs->trans("Balance").' : '.price($this->solde(1), 0, $langs, 1, -1, -1, $this->currency_code).''; + } + if (method_exists($this, 'getLibStatut')) { + $return .= '
';
+ $return .= ''.substr($this->type_lib[$this->type], 0, 24).'...'; + } + if (method_exists($this, 'solde')) { + $return .= '
'; + $return .= ''.$langs->trans("Balance").' : '.price($this->solde(1), 0, $langs, 1, -1, -1, $this->currency_code).''; + } + if (method_exists($this, 'getLibStatut')) { + $return .= '
'.$this->getLibStatut(5).'
';
+ }
+ $return .= '';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 098489e6f7b..2a0995af009 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -52,6 +52,7 @@ $show_files = GETPOST('show_files', 'int');
$confirm = GETPOST('confirm', 'alpha');
$toselect = GETPOST('toselect', 'array');
$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bankaccountlist'; // To manage different context of search
+$mode = GETPOST('mode', 'alpha');
$search_ref = GETPOST('search_ref', 'alpha');
$search_label = GETPOST('search_label', 'alpha');
@@ -305,6 +306,9 @@ llxHeader('', $title, $help_url);
$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);
}
@@ -365,8 +369,13 @@ print '';
print '';
print '';
+print '';
-$newcardbutton = dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
+
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank_account', 0, $newcardbutton, '', $limit, 1);
@@ -584,224 +593,236 @@ foreach ($accounts as $key => $type) {
$lastcurrencycode = $objecttmp->currency_code;
}
- print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'';
+ if (property_exists($this, 'fk_bank')) {
+ $return .= ' | '.$this->fk_bank.'';
+ }
+ if (property_exists($this, 'datep')) {
+ $return .= '
'.$langs->trans("Date").' : '.dol_print_date($this->db->jdate($this->datep), 'day').''; + } + if (property_exists($this, 'type_payment') && !empty($this->type_payment)) { + $return .= '
'.$langs->trans("Payment", $this->type_payment).' : '.$this->type_payment.''; + } + if (property_exists($this, 'accountancy_code')) { + $return .= '
'.$langs->trans("Account").' : '.$this->accountancy_code.''; + } + if (property_exists($this, 'amount')) { + $return .= '
'.$langs->trans("Debit").' : '.price($this->amount).''; + } + $return .= '
';
+ $return .= ''.$langs->trans("Date").' : '.dol_print_date($this->db->jdate($this->datep), 'day').''; + } + if (property_exists($this, 'type_payment') && !empty($this->type_payment)) { + $return .= '
'.$langs->trans("Payment", $this->type_payment).' : '.$this->type_payment.''; + } + if (property_exists($this, 'accountancy_code')) { + $return .= '
'.$langs->trans("Account").' : '.$this->accountancy_code.''; + } + if (property_exists($this, 'amount')) { + $return .= '
'.$langs->trans("Debit").' : '.price($this->amount).''; + } + $return .= '
';
+ }
+ // Output Kanban
+ print $objecttmp->getKanbanView('');
+ if ($i == (min($num, $limit) - 1)) {
+ print '
';
+ print '"; //add stripe sepa button $buttonlabel = $langs->trans("MakeWithdrawRequestStripe"); @@ -781,14 +781,14 @@ if ($object->id > 0) { if ($type == 'bank-transfer') { print '
'.$langs->trans("DoCreditTransferBeforePayments");
- if (isModEnabled('stripe')) {
+ if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
}
print ' '.$langs->trans("DoStandingOrdersBeforePayments3");
print '
'; } else { print '
'.$langs->trans("DoStandingOrdersBeforePayments");
- if (isModEnabled('stripe')) {
+ if (isModEnabled('stripe') && getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT')) {
print ' '.$langs->trans("DoStandingOrdersBeforePayments2");
}
print ' '.$langs->trans("DoStandingOrdersBeforePayments3");
@@ -807,13 +807,13 @@ if ($object->id > 0) {
print ''.$langs->trans("User").' ';
print ''.$langs->trans("Amount").' ';
print ''.$langs->trans("DateProcess").' ';
- print ' ';
if ($type == 'bank-transfer') {
print ''.$langs->trans("BankTransferReceipt").' ';
} else {
print ''.$langs->trans("WithdrawalReceipt").' ';
}
print ' ';
+ print ' ';
print '';
$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande,";
@@ -864,9 +864,10 @@ if ($object->id > 0) {
// Amount
print ''.price($obj->amount).' ';
- // Ref of SEPA request
+ // Date process
print ''.$langs->trans("OrderWaiting").' ';
+ // Link to make payment now
print '';
if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
$langs->load("stripe");
@@ -874,8 +875,10 @@ if ($object->id > 0) {
}
print ' ';
+ //
print '- ';
+ // Actions
print '';
print '';
print img_delete();
@@ -929,14 +932,21 @@ if ($object->id > 0) {
print '';
+ // Date
print ''.dol_print_date($db->jdate($obj->date_demande), 'day')." \n";
+ // User
print '';
print $tmpuser->getNomUrl(1, '', 0, 0, 0, 0, 'login');
print ' ';
+ // Amount
print ''.price($obj->amount).' ';
+ // Date process
+ print ''.dol_print_date($db->jdate($obj->date_traite), 'day')." \n";
+
+ // Link to payment request done
print '';
if ($obj->fk_prelevement_bons > 0) {
$withdrawreceipt = new BonPrelevement($db);
@@ -946,10 +956,10 @@ if ($object->id > 0) {
}
print " \n";
+ //
print ' ';
- print ''.dol_print_date($db->jdate($obj->date_traite), 'day')." \n";
-
+ // Actions
print ' ';
print " \n";
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index ed467ec91f4..d2300128550 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -629,4 +629,38 @@ class Localtax extends CommonObject
return '';
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs;
+ $return = '';
-
+ $localtax_static->label = $obj->label;
$localtax_static->id = $obj->rowid;
$localtax_static->ref = $obj->rowid;
- print "".$localtax_static->getNomUrl(1)." \n";
- print "".dol_trunc($obj->label, 40)." \n";
- print ''.dol_print_date($db->jdate($obj->datev), 'day')." \n";
- print ''.dol_print_date($db->jdate($obj->datep), 'day')." \n";
+ $localtax_static->datev = $obj->datev;
+ $localtax_static->datep = $obj->datep;
+ $localtax_static->amount = $obj->amount;
+
$total = $total + $obj->amount;
- print ''.price($obj->amount).' ';
- print " \n";
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print '';
+ print ' ';
+ print "".$localtax_static->getNomUrl(1)." \n";
+ print "".dol_trunc($obj->label, 40)." \n";
+ print ''.dol_print_date($db->jdate($obj->datev), 'day')." \n";
+ print ''.dol_print_date($db->jdate($obj->datep), 'day')." \n";
+ print ''.price($obj->amount).' ';
+ print " \n";
+ }
$i++;
}
print ''.$langs->trans("Total").' ';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index e193939cdd6..1e4e7d05a7d 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -1020,4 +1020,43 @@ class RemiseCheque extends CommonObject
return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs;
+
+ $return = ' \n";
- print '';
- print '';
-
- print '';
- print $company->getNomUrl(1);
- print " \n";
-
-
- print '';
- $link_to_tab = '/comm/card.php?socid=';
- $link_code = $obj->code_client;
- if ($type == 'bank-transfer') {
- $link_to_tab = '/fourn/card.php?socid=';
- $link_code = $obj->code_fournisseur;
- }
- print ''.$link_code." \n";
-
- print ''.dol_print_date($db->jdate($obj->datec), 'day')." \n";
-
- print ''.price($obj->amount)." \n";
-
- print ' ';
-
- print "\n";
$i++;
}
} else {
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 01ef33eea9d..bead580ab31 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -54,6 +54,8 @@ if (!$sortfield) {
}
$optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST('mode', 'alpha');
+
// Get supervariables
$statut = GETPOST('statut', 'int');
@@ -147,6 +149,9 @@ if ($result) {
$i = 0;
$param = '';
+ if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+ }
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
@@ -161,6 +166,8 @@ if ($result) {
$selectedfields = '';
$newcardbutton = '';
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
if ($usercancreate) {
$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type='.urlencode($type));
}
@@ -176,6 +183,8 @@ if ($result) {
print '';
print '';
print '';
+ print '';
+
if ($type != '') {
print '';
}
@@ -220,27 +229,41 @@ if ($result) {
$directdebitorder->id = $obj->rowid;
$directdebitorder->ref = $obj->ref;
- $directdebitorder->datec = $obj->datec;
- $directdebitorder->amount = $obj->amount;
+ $directdebitorder->date_echeance = $obj->datec;
+ $directdebitorder->total = $obj->amount;
$directdebitorder->statut = $obj->statut;
- print '';
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print ' ';
+ print ' ';
- print ''.dol_print_date($db->jdate($obj->datec), 'day')." \n";
+ print '';
+ print $directdebitorder->getNomUrl(1);
+ print " \n";
- print ''.price($obj->amount)." \n";
+ print ''.dol_print_date($db->jdate($obj->datec), 'day')." \n";
- print '';
- print $bon->LibStatut($obj->statut, 5);
- print ' ';
+ print ''.price($obj->amount)." \n";
- print '';
+ print $bon->LibStatut($obj->statut, 5);
+ print ' ';
- print " \n";
+ print ''.price($r).' ';
- $sommes[$code]['N'] += $r;
+ if (empty($sommes[$code]['N'])) {
+ $sommes[$code]['N'] = $r;
+ } else {
+ $sommes[$code]['N'] += $r;
+ }
// Detail by month
foreach ($months as $k => $v) {
if (($k + 1) >= $date_startmonth) {
foreach ($sommes as $code => $det) {
- $vars[$code] = $det['M'][$k];
+ $vars[$code] = empty($det['M'][$k]) ? 0 : $det['M'][$k];
}
$result = strtr($formula, $vars);
$result = str_replace('--', '+', $result);
@@ -386,14 +394,18 @@ if ($modecompta == 'CREANCES-DETTES') {
$r = dol_eval($result, 1, 1, '1');
print ''.price($r).' ';
- $sommes[$code]['M'][$k] += $r;
+ if (empty($sommes[$code]['M'][$k])) {
+ $sommes[$code]['M'][$k] = $r;
+ } else {
+ $sommes[$code]['M'][$k] += $r;
+ }
}
}
foreach ($months as $k => $v) {
if (($k + 1) < $date_startmonth) {
foreach ($sommes as $code => $det) {
- $vars[$code] = $det['M'][$k];
+ $vars[$code] = empty($det['M'][$k]) ? 0 : $det['M'][$k];
}
$result = strtr($formula, $vars);
$result = str_replace('--', '+', $result);
@@ -402,7 +414,11 @@ if ($modecompta == 'CREANCES-DETTES') {
$r = dol_eval($result, 1, 1, '1');
print ''.price($r).' ';
- $sommes[$code]['M'][$k] += $r;
+ if (empty($sommes[$code]['M'][$k])) {
+ $sommes[$code]['M'][$k] = $r;
+ } else {
+ $sommes[$code]['M'][$k] += $r;
+ }
}
}
@@ -429,14 +445,14 @@ if ($modecompta == 'CREANCES-DETTES') {
$arrayofaccountforfilter = array();
foreach ($cpts as $i => $cpt) { // Loop on each account.
- if (!is_null($cpt['account_number'])) {
+ if (isset($cpt['account_number'])) {
$arrayofaccountforfilter[] = $cpt['account_number'];
}
}
// N-1
if (!empty($arrayofaccountforfilter)) {
- $return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, $cat['dc'] ? $cat['dc'] : 0);
+ $return = $AccCat->getSumDebitCredit($arrayofaccountforfilter, $date_start_previous, $date_end_previous, empty($cat['dc']) ? 0 : $cat['dc']);
if ($return < 0) {
setEventMessages(null, $AccCat->errors, 'errors');
$resultNP = 0;
@@ -444,8 +460,16 @@ if ($modecompta == 'CREANCES-DETTES') {
foreach ($cpts as $i => $cpt) { // Loop on each account found
$resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']]) ? 0 : $AccCat->sdcperaccount[$cpt['account_number']];
- $totCat['NP'] += $resultNP;
- $sommes[$code]['NP'] += $resultNP;
+ if (empty($totCat['NP'])) {
+ $totCat['NP'] = $resultNP;
+ } else {
+ $totCat['NP'] += $resultNP;
+ }
+ if (empty($sommes[$code]['NP'])) {
+ $sommes[$code]['NP'] = $resultNP;
+ } else {
+ $sommes[$code]['NP'] += $resultNP;
+ }
$totPerAccount[$cpt['account_number']]['NP'] = $resultNP;
}
}
@@ -467,23 +491,47 @@ if ($modecompta == 'CREANCES-DETTES') {
}
//var_dump($monthtoprocess.'_'.$yeartoprocess);
- $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cat['dc'] ? $cat['dc'] : 0, 'nofilter', $monthtoprocess, $yeartoprocess);
- if ($return < 0) {
- setEventMessages(null, $AccCat->errors, 'errors');
- $resultM = 0;
+ if (isset($cpt['account_number'])) {
+ $return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, empty($cat['dc']) ? 0 : $cat['dc'], 'nofilter', $monthtoprocess, $yeartoprocess);
+ if ($return < 0) {
+ setEventMessages(null, $AccCat->errors, 'errors');
+ $resultM = 0;
+ } else {
+ $resultM = $AccCat->sdc;
+ }
} else {
- $resultM = $AccCat->sdc;
+ $resultM = 0;
+ }
+ if (empty($totCat['M'][$k])) {
+ $totCat['M'][$k] = $resultM;
+ } else {
+ $totCat['M'][$k] += $resultM;
+ }
+ if (empty($sommes[$code]['M'][$k])) {
+ $sommes[$code]['M'][$k] = $resultM;
+ } else {
+ $sommes[$code]['M'][$k] += $resultM;
+ }
+ if (isset($cpt['account_number'])) {
+ $totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
}
- $totCat['M'][$k] += $resultM;
- $sommes[$code]['M'][$k] += $resultM;
- $totPerAccount[$cpt['account_number']]['M'][$k] = $resultM;
$resultN += $resultM;
}
- $totCat['N'] += $resultN;
- $sommes[$code]['N'] += $resultN;
- $totPerAccount[$cpt['account_number']]['N'] = $resultN;
+ if (empty($totCat)) {
+ $totCat['N'] = $resultN;
+ } else {
+ $totCat['N'] += $resultN;
+ }
+ if (empty($sommes[$code]['N'])) {
+ $sommes[$code]['N'] = $resultN;
+ } else {
+ $sommes[$code]['N'] += $resultN;
+ }
+ if (isset($cpt['account_number'])) {
+ $totPerAccount[$cpt['account_number']]['N'] = $resultN;
+ }
}
@@ -543,16 +591,26 @@ if ($modecompta == 'CREANCES-DETTES') {
// Loop on detail of all accounts to output the detail
if ($showaccountdetail != 'no') {
foreach ($cpts as $i => $cpt) {
- $resultNP = $totPerAccount[$cpt['account_number']]['NP'];
- $resultN = $totPerAccount[$cpt['account_number']]['N'];
+ if (isset($cpt['account_number'])) {
+ $resultNP = $totPerAccount[$cpt['account_number']]['NP'];
+ $resultN = $totPerAccount[$cpt['account_number']]['N'];
+ } else {
+ $resultNP = 0;
+ $resultN = 0;
+ }
if ($showaccountdetail == 'all' || $resultN != 0) {
print '';
print '';
- print ' '.length_accountg($cpt['account_number']);
- print ' - ';
- print $cpt['account_label'];
+
+ if (isset($cpt['account_number'])) {
+ $labeldetail = ' '.length_accountg($cpt['account_number']).' - '.$cpt['account_label'];
+ } else {
+ $labeldetail = '-';
+ }
+
+ print ' ';
+ print dol_escape_htmltag($labeldetail);
print ' ';
print ''.price($resultNP).' ';
print ''.price($resultN).' ';
@@ -560,13 +618,21 @@ if ($modecompta == 'CREANCES-DETTES') {
// Make one call for each month
foreach ($months as $k => $v) {
if (($k + 1) >= $date_startmonth) {
- $resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
+ if (isset($cpt['account_number'])) {
+ $resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
+ } else {
+ $resultM = 0;
+ }
print ''.price($resultM).' ';
}
}
foreach ($months as $k => $v) {
if (($k + 1) < $date_startmonth) {
- $resultM = $totPerAccount[$cpt['account_number']]['M'][$k];
+ if (isset($cpt['account_number'])) {
+ $resultM = empty($totPerAccount[$cpt['account_number']]['M'][$k]) ? 0 : $totPerAccount[$cpt['account_number']]['M'][$k];
+ } else {
+ $resultM = 0;
+ }
print ''.price($resultM).' ';
}
}
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 37b3540a0f5..b5e98b3b62e 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -749,4 +749,38 @@ class ChargeSociales extends CommonObject
$this->type = 1;
$this->type_label = 'Type of social contribution';
}
+
+ /**
+ * Return clicable link of object (with eventually picto)
+ *
+ * @param string $option Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
+ * @return string HTML Code for Kanban thumb.
+ */
+ public function getKanbanView($option = '')
+ {
+ global $langs;
+ $return = ' ';
-
- // Line number
- if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
- print ''.(($offset * $limit) + $i).' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print ' ';
+ print ' ';
- // Label
- if (!empty($arrayfields['cs.libelle']['checked'])) {
- print ''.dol_escape_htmltag($obj->label).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Type
- if (!empty($arrayfields['cs.fk_type']['checked'])) {
- $typelabeltoshow = $obj->type_label;
- $typelabelpopup = $obj->type_label;
- if (isModEnabled('accounting')) {
- $typelabelpopup .= ' - '.$langs->trans("AccountancyCode").': '.$obj->type_accountancy_code;
- }
- print ''.dol_escape_htmltag($typelabeltoshow).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Date
- if (!empty($arrayfields['cs.date_ech']['checked'])) {
- print ''.dol_print_date($db->jdate($obj->date_ech), 'day').' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Date end period
- if (!empty($arrayfields['cs.periode']['checked'])) {
- print ''.dol_print_date($db->jdate($obj->periode), 'day').' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Project ref
- if (!empty($arrayfields['p.ref']['checked'])) {
- print '';
- if ($obj->project_id > 0) {
- print $projectstatic->getNomUrl(1);
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- if (!empty($arrayfields['cs.fk_user']['checked'])) {
- // Employee
- print '';
- if (!empty($obj->fk_user)) {
- if (!empty($TLoadedUsers[$obj->fk_user])) {
- $ustatic = $TLoadedUsers[$obj->fk_user];
- } else {
- $ustatic = new User($db);
- $ustatic->fetch($obj->fk_user);
- $TLoadedUsers[$obj->fk_user] = $ustatic;
+ // Line number
+ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+ print ' '.(($offset * $limit) + $i).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
}
- print $ustatic->getNomUrl(-1);
}
- print "\n";
+
+ // Ref
+ if (!empty($arrayfields['cs.rowid']['checked'])) {
+ print ''.$chargesociale_static->getNomUrl(1, '20').' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Label
+ if (!empty($arrayfields['cs.libelle']['checked'])) {
+ print ''.dol_escape_htmltag($obj->label).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Type
+ if (!empty($arrayfields['cs.fk_type']['checked'])) {
+ $typelabeltoshow = $obj->type_label;
+ $typelabelpopup = $obj->type_label;
+ if (isModEnabled('accounting')) {
+ $typelabelpopup .= ' - '.$langs->trans("AccountancyCode").': '.$obj->type_accountancy_code;
+ }
+ print ''.dol_escape_htmltag($typelabeltoshow).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Date
+ if (!empty($arrayfields['cs.date_ech']['checked'])) {
+ print ''.dol_print_date($db->jdate($obj->date_ech), 'day').' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Date end period
+ if (!empty($arrayfields['cs.periode']['checked'])) {
+ print ''.dol_print_date($db->jdate($obj->periode), 'day').' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Project ref
+ if (!empty($arrayfields['p.ref']['checked'])) {
+ print '';
+ if ($obj->project_id > 0) {
+ print $projectstatic->getNomUrl(1);
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ if (!empty($arrayfields['cs.fk_user']['checked'])) {
+ // Employee
+ print '';
+ if (!empty($obj->fk_user)) {
+ if (!empty($TLoadedUsers[$obj->fk_user])) {
+ $ustatic = $TLoadedUsers[$obj->fk_user];
+ } else {
+ $ustatic = new User($db);
+ $ustatic->fetch($obj->fk_user);
+ $TLoadedUsers[$obj->fk_user] = $ustatic;
+ }
+ print $ustatic->getNomUrl(-1);
+ }
+ print " \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Type
+ if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
+ print 'payment_code)).'">';
+ if (!empty($obj->payment_code)) {
+ print $langs->trans("PaymentTypeShort".$obj->payment_code);
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Account
+ if (!empty($arrayfields['cs.fk_account']['checked'])) {
+ print '';
+ if ($obj->fk_account > 0) {
+ $bankstatic->id = $obj->fk_account;
+ $bankstatic->ref = $obj->bref;
+ $bankstatic->number = $obj->bnumber;
+ $bankstatic->iban = $obj->iban;
+ $bankstatic->bic = $obj->bic;
+ $bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
+ $bankstatic->account_number = $obj->account_number;
+ $bankstatic->clos = $obj->clos;
+
+ //$accountingjournal->fetch($obj->fk_accountancy_journal);
+ //$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+
+ $bankstatic->label = $obj->blabel;
+ print $bankstatic->getNomUrl(1);
+ }
+ print ' ';
+ if (!$i) $totalarray['nbfield']++;
+ }
+
+ // Amount
+ if (!empty($arrayfields['cs.amount']['checked'])) {
+ print ''.price($obj->amount).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+ }
+ $totalarray['val']['totalttcfield'] += $obj->amount;
+ }
+
+ // Status
+ if (!empty($arrayfields['cs.paye']['checked'])) {
+ print ''.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Buttons
+ print ' '."\n";
}
-
- // Type
- if (!empty($arrayfields['cs.fk_mode_reglement']['checked'])) {
- print 'payment_code)).'">';
- if (!empty($obj->payment_code)) {
- print $langs->trans("PaymentTypeShort".$obj->payment_code);
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Account
- if (!empty($arrayfields['cs.fk_account']['checked'])) {
- print '';
- if ($obj->fk_account > 0) {
- $bankstatic->id = $obj->fk_account;
- $bankstatic->ref = $obj->bref;
- $bankstatic->number = $obj->bnumber;
- $bankstatic->iban = $obj->iban;
- $bankstatic->bic = $obj->bic;
- $bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
- $bankstatic->account_number = $obj->account_number;
- $bankstatic->clos = $obj->clos;
-
- //$accountingjournal->fetch($obj->fk_accountancy_journal);
- //$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-
- $bankstatic->label = $obj->blabel;
- print $bankstatic->getNomUrl(1);
- }
- print ' ';
- if (!$i) $totalarray['nbfield']++;
- }
-
- // Amount
- if (!empty($arrayfields['cs.amount']['checked'])) {
- print ''.price($obj->amount).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
- }
- $totalarray['val']['totalttcfield'] += $obj->amount;
- }
-
- // Status
- if (!empty($arrayfields['cs.paye']['checked'])) {
- print ''.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
-
- // Buttons
- print '';
-
- // No
- if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
- print ''.(($offset * $limit) + $i).' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print ' ';
+ print ' ';
- // Label
- if (!empty($arrayfields['t.label']['checked'])) {
- print ''.dol_trunc($obj->label, 40).' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ // No
+ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+ print ''.(($offset * $limit) + $i).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
- }
- // Date end period
- if (!empty($arrayfields['t.datev']['checked'])) {
- print ''.dol_print_date($db->jdate($obj->datev), 'day').' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ // Ref
+ if (!empty($arrayfields['t.rowid']['checked'])) {
+ print '';
+ print $tva_static->getNomUrl(1);
+ $filename = dol_sanitizeFileName($tva_static->ref);
+ $filedir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($tva_static->ref);
+ $urlsource = $_SERVER['PHP_SELF'].'?id='.$tva_static->id;
+ print $formfile->getDocumentsLink($tva_static->element, $filename, $filedir, '', 'valignmiddle paddingleft2imp');
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
- }
- // Date payment
- /*if (!empty($arrayfields['t.datep']['checked'])) {
- print ''.dol_print_date($db->jdate($obj->datep), 'day').' ';
- if (!$i) $totalarray['nbfield']++;
- }*/
-
- // Type
- if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
- print '';
- if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ // Label
+ if (!empty($arrayfields['t.label']['checked'])) {
+ print ''.dol_trunc($obj->label, 40).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
- }
- // Account
- if (!empty($arrayfields['t.fk_account']['checked'])) {
- print '';
- if ($obj->fk_account > 0) {
- $bankstatic->id = $obj->fk_account;
- $bankstatic->ref = $obj->bref;
- $bankstatic->number = $obj->bnumber;
- $bankstatic->iban = $obj->iban;
- $bankstatic->bic = $obj->bic;
- $bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
- $bankstatic->account_number = $obj->account_number;
- $bankstatic->clos = $obj->clos;
-
- //$accountingjournal->fetch($obj->fk_accountancy_journal);
- //$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-
- $bankstatic->label = $obj->blabel;
- print $bankstatic->getNomUrl(1);
+ // Date end period
+ if (!empty($arrayfields['t.datev']['checked'])) {
+ print ' '.dol_print_date($db->jdate($obj->datev), 'day').' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
- print '';
- if (!$i) $totalarray['nbfield']++;
- }
- // Amount
- if (!empty($arrayfields['t.amount']['checked'])) {
- $total = $total + $obj->amount;
- print '' . price($obj->amount) . ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- $totalarray['pos'][$totalarray['nbfield']] = 'amount';
- if (empty($totalarray['val']['amount'])) {
- $totalarray['val']['amount'] = $obj->amount;
- } else {
- $totalarray['val']['amount'] += $obj->amount;
- }
- }
+ // Date payment
+ /*if (!empty($arrayfields['t.datep']['checked'])) {
+ print ''.dol_print_date($db->jdate($obj->datep), 'day').' ';
+ if (!$i) $totalarray['nbfield']++;
+ }*/
- if (!empty($arrayfields['t.status']['checked'])) {
- print '' . $tva_static->LibStatut($obj->paye, 5, $obj->alreadypayed) . ' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ // Type
+ if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
+ print '';
+ if (!empty($obj->payment_code)) print $langs->trans("PaymentTypeShort".$obj->payment_code);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
}
+
+ // Account
+ if (!empty($arrayfields['t.fk_account']['checked'])) {
+ print '';
+ if ($obj->fk_account > 0) {
+ $bankstatic->id = $obj->fk_account;
+ $bankstatic->ref = $obj->bref;
+ $bankstatic->number = $obj->bnumber;
+ $bankstatic->iban = $obj->iban;
+ $bankstatic->bic = $obj->bic;
+ $bankstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
+ $bankstatic->account_number = $obj->account_number;
+ $bankstatic->clos = $obj->clos;
+
+ //$accountingjournal->fetch($obj->fk_accountancy_journal);
+ //$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+
+ $bankstatic->label = $obj->blabel;
+ print $bankstatic->getNomUrl(1);
+ }
+ print ' ';
+ if (!$i) $totalarray['nbfield']++;
+ }
+
+ // Amount
if (!empty($arrayfields['t.amount']['checked'])) {
- $totalarray['pos'][$totalarray['nbfield']] = '';
+ $total = $total + $obj->amount;
+ print '' . price($obj->amount) . ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ $totalarray['pos'][$totalarray['nbfield']] = 'amount';
+ if (empty($totalarray['val']['amount'])) {
+ $totalarray['val']['amount'] = $obj->amount;
+ } else {
+ $totalarray['val']['amount'] += $obj->amount;
+ }
}
+
+ if (!empty($arrayfields['t.status']['checked'])) {
+ print '' . $tva_static->LibStatut($obj->paye, 5, $obj->alreadypayed) . ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!empty($arrayfields['t.amount']['checked'])) {
+ $totalarray['pos'][$totalarray['nbfield']] = '';
+ }
+ }
+
+ // Buttons
+ print ' ';
}
- // Buttons
- print '';
print '';
print ' ';
}
+
// Region
if (!empty($arrayfields['region.nom']['checked']))
{
print '';
print '';
print ' ';
- }*/
+ }
+*/
+
// Country
if (!empty($arrayfields['country.code_iso']['checked'])) {
print '';
@@ -1014,7 +1038,7 @@ if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom'][
print '';
print ' ';
}
-// Alias
+// Alias of ThirdParty
if (!empty($arrayfields['s.name_alias']['checked'])) {
print '';
print '';
@@ -1079,7 +1103,7 @@ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
}
print '';
-// Ligne des titres
+// Title line
print ' ';
if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
@@ -1238,6 +1262,7 @@ while ($i < min($num, $limit)) {
}
print '';
}
+
// ID
if (!empty($arrayfields['p.rowid']['checked'])) {
print '';
@@ -1247,7 +1272,8 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
- // Name
+
+ // (Last) Name
if (!empty($arrayfields['p.lastname']['checked'])) {
print ' ';
print $contactstatic->getNomUrl(1);
@@ -1256,6 +1282,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Firstname
if (!empty($arrayfields['p.firstname']['checked'])) {
print ' '.dol_escape_htmltag($obj->firstname).' ';
@@ -1263,6 +1290,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Job position
if (!empty($arrayfields['p.poste']['checked'])) {
print ''.dol_escape_htmltag($obj->poste).' ';
@@ -1270,6 +1298,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Address
if (!empty($arrayfields['p.address']['checked'])) {
print ''.dol_escape_htmltag($obj->address).' ';
@@ -1277,6 +1306,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Zip
if (!empty($arrayfields['p.zip']['checked'])) {
print ''.dol_escape_htmltag($obj->zip).' ';
@@ -1284,6 +1314,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Town
if (!empty($arrayfields['p.town']['checked'])) {
print ''.dol_escape_htmltag($obj->town).' ';
@@ -1291,18 +1322,22 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
+ /*
// State
- /*if (!empty($arrayfields['state.nom']['checked']))
+ if (!empty($arrayfields['state.nom']['checked']))
{
print "".$obj->state_name." \n";
if (! $i) $totalarray['nbfield']++;
}
+
// Region
if (!empty($arrayfields['region.nom']['checked']))
{
print "".$obj->region_name." \n";
if (! $i) $totalarray['nbfield']++;
}*/
+
// Country
if (!empty($arrayfields['country.code_iso']['checked'])) {
print '';
@@ -1313,13 +1348,15 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
- // Phone
+
+ // Phone pro
if (!empty($arrayfields['p.phone']['checked'])) {
print ' '.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').' ';
if (!$i) {
$totalarray['nbfield']++;
}
}
+
// Phone perso
if (!empty($arrayfields['p.phone_perso']['checked'])) {
print ''.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').' ';
@@ -1327,6 +1364,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Phone mobile
if (!empty($arrayfields['p.phone_mobile']['checked'])) {
print ''.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').' ';
@@ -1334,6 +1372,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Fax
if (!empty($arrayfields['p.fax']['checked'])) {
print ''.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').' ';
@@ -1341,6 +1380,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// EMail
if (!empty($arrayfields['p.email']['checked'])) {
print ''.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).' ';
@@ -1348,7 +1388,8 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
- // No EMail
+
+ // No EMail Subscription
if (!empty($arrayfields['unsubscribed']['checked'])) {
print '';
if (empty($obj->email)) {
@@ -1361,6 +1402,8 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
+ // Social Networks
if (isModEnabled('socialnetworks')) {
foreach ($socialnetworks as $key => $value) {
if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
@@ -1371,13 +1414,14 @@ while ($i < min($num, $limit)) {
}
}
}
- // Company
+
+ // Company / Third Party
if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked'])) {
print ' ';
if ($obj->socid) {
$objsoc = new Societe($db);
$objsoc->fetch($obj->socid);
- print $objsoc->getNomUrl(1);
+ print $objsoc->getNomUrl(1, '', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
} else {
print ' ';
}
@@ -1405,8 +1449,8 @@ while ($i < min($num, $limit)) {
}
}
+ // Prospect Level
if (!empty($arrayfields['p.fk_prospectlevel']['checked'])) {
- // Prospect level
print ' ';
print $contactstatic->getLibProspLevel();
print " ";
@@ -1415,8 +1459,8 @@ while ($i < min($num, $limit)) {
}
}
+ // Prospect status
if (!empty($arrayfields['p.fk_stcommcontact']['checked'])) {
- // Prospect status
print ''.$contracttmp->getFormatedCustomerRef($obj->ref_customer).' ';
+ }
+ if (!empty($arrayfields['c.ref_supplier']['checked'])) {
+ print ''.dol_escape_htmltag($obj->ref_supplier).' ';
+ }
+ if (!empty($arrayfields['s.nom']['checked'])) {
+ print '';
+ if ($obj->socid > 0) {
+ // TODO Use a cache for this string
+ print $socstatic->getNomUrl(1, '');
+ }
+ print ' ';
+ }
+ // Email
+ if (!empty($arrayfields['s.email']['checked'])) {
+ print ''.dol_print_email($obj->email, 0, $obj->socid, 0, 0, 1, 1).' ';
+ }
+ // Town
+ if (!empty($arrayfields['s.town']['checked'])) {
+ print '';
+ print $obj->town;
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Zip
+ if (!empty($arrayfields['s.zip']['checked'])) {
+ print '';
+ print $obj->zip;
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // State
+ if (!empty($arrayfields['state.nom']['checked'])) {
+ print "".$obj->state_name." \n";
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Country
+ if (!empty($arrayfields['country.code_iso']['checked'])) {
+ print '';
+ print dol_escape_htmltag($socstatic->country);
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Type ent
+ if (!empty($arrayfields['typent.code']['checked'])) {
+ print '';
+ if (count($typenArray) == 0) {
+ $typenArray = $formcompany->typent_array(1);
+ }
+ print $typenArray[$obj->typent_code];
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ if (!empty($arrayfields['sale_representative']['checked'])) {
+ // Sales representatives
+ print '';
+ if ($obj->socid > 0) {
+ $listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
+ if ($listsalesrepresentatives < 0) {
+ dol_print_error($db);
+ }
+ $nbofsalesrepresentative = count($listsalesrepresentatives);
+ if ($nbofsalesrepresentative > 6) {
+ // We print only number
+ print $nbofsalesrepresentative;
+ } elseif ($nbofsalesrepresentative > 0) {
+ $userstatic = new User($db);
+ $j = 0;
+ foreach ($listsalesrepresentatives as $val) {
+ $userstatic->id = $val['id'];
+ $userstatic->lastname = $val['lastname'];
+ $userstatic->firstname = $val['firstname'];
+ $userstatic->email = $val['email'];
+ $userstatic->statut = $val['statut'];
+ $userstatic->entity = $val['entity'];
+ $userstatic->photo = $val['photo'];
+ $userstatic->login = $val['login'];
+ $userstatic->phone = $val['phone'];
+ $userstatic->job = $val['job'];
+ $userstatic->gender = $val['gender'];
+
+ //print ' ';
+ }
+ // Date
+ if (!empty($arrayfields['c.date_contrat']['checked'])) {
+ print ''.dol_print_date($db->jdate($obj->date_contrat), 'day', 'tzserver').' ';
+ }
+ // Extra fields
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+ // Fields from hook
+ $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ // Date creation
+ if (!empty($arrayfields['c.datec']['checked'])) {
+ print '';
+ print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Date modification
+ if (!empty($arrayfields['c.tms']['checked'])) {
+ print '';
+ print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Date lower end date
+ if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
+ print '';
+ print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+ // Status
+ if (!empty($arrayfields['status']['checked'])) {
+ print ''.($obj->nb_initial > 0 ? $obj->nb_initial : '').' ';
+ print ''.($obj->nb_running > 0 ? $obj->nb_running : '').' ';
+ print ''.($obj->nb_expired > 0 ? $obj->nb_expired : '').' ';
+ print ''.($obj->nb_closed > 0 ? $obj->nb_closed : '').' ';
+ }
+ // Action column
+ if (!getDolGlobalString('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($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print '';
+ }
+ print ' ';
+ }
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+
+ print " \n";
+ }
$i++;
}
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 23c2159bc8f..ab041e63385 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -1708,6 +1708,66 @@ if (!$error && ($massaction == 'increaseholiday' || ($action == 'increaseholiday
}
}
+//if (!$error && $massaction == 'clonetasks' && $user->rights->projet->creer) {
+if (!$error && ($massaction == 'clonetasks' || ($action == 'clonetasks' && $confirm == 'yes'))) {
+ $num = 0;
+
+ dol_include_once('/projet/class/task.class.php');
+
+ $origin_task = new Task($db);
+ $clone_task = new Task($db);
+
+ foreach (GETPOST('selected') as $task) {
+ $origin_task->fetch($task, $ref = '', $loadparentdata = 0);
+
+ $defaultref = '';
+ $obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
+ if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . ".php")) {
+ require_once DOL_DOCUMENT_ROOT . "/core/modules/project/task/" . $conf->global->PROJECT_TASK_ADDON . '.php';
+ $modTask = new $obj;
+ $defaultref = $modTask->getNextValue(0, $clone_task);
+ }
+
+ if (!$error) {
+ $clone_task->fk_project = GETPOST('projectid', 'int');
+ $clone_task->ref = $defaultref;
+ $clone_task->label = $origin_task->label;
+ $clone_task->description = $origin_task->description;
+ $clone_task->planned_workload = $origin_task->planned_workload;
+ $clone_task->fk_task_parent = $origin_task->fk_task_parent;
+ $clone_task->date_c = dol_now();
+ $clone_task->date_start = $origin_task->date_start;
+ $clone_task->date_end = $origin_task->date_end;
+ $clone_task->progress = $origin_task->progress;
+
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost(null, $clone_task);
+
+ $taskid = $clone_task->create($user);
+
+ if ($taskid > 0) {
+ $result = $clone_task->add_contact(GETPOST("userid", 'int'), 'TASKEXECUTIVE', 'internal');
+ $num++;
+ } else {
+ if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+ $langs->load("projects");
+ setEventMessages($langs->trans('NewTaskRefSuggested'), '', 'warnings');
+ $duplicate_code_error = true;
+ } else {
+ setEventMessages($clone_task->error, $clone_task->errors, 'errors');
+ }
+ $action = 'list';
+ $error++;
+ }
+ }
+ }
+
+ if (!$error) {
+ setEventMessage($langs->trans('NumberOfTasksCloned', $num));
+ header("Refresh: 1;URL=".DOL_URL_ROOT.'/projet/tasks.php?id=' . GETPOST('projectid', 'int'));
+ }
+}
+
$parameters['toselect'] = (empty($toselect) ? array() : $toselect);
$parameters['uploaddir'] = $uploaddir;
$parameters['massaction'] = $massaction;
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index e5dc91c05d1..b01c952662e 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -36,9 +36,10 @@ if (!defined('NOREQUIREAJAX')) {
if (!defined('NOREQUIRESOC')) {
define('NOREQUIRESOC', '1');
}
-if (!defined('NOREQUIRETRAN')) {
+// We need langs because the getRandomPassword may use user language to define some rules of pass generation
+/*if (!defined('NOREQUIRETRAN')) {
define('NOREQUIRETRAN', '1');
-}
+}*/
// Load Dolibarr environment
require '../../main.inc.php';
@@ -55,9 +56,9 @@ top_httphead();
//print ''."\n";
-// Registering the location of boxes
+// Return a new generated password
if ($action) {
- if ($action == 'getrandompassword' && ($user->admin || $user->rights->api->apikey->generate)) {
+ if ($action == 'getrandompassword') {
require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
$generic = GETPOST('generic') ? true : false;
echo getRandomPassword($generic);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index abf30f2f3ee..7c136f446d9 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -1288,7 +1288,8 @@ abstract class CommonDocGenerator
}
$extrafields = $this->extrafieldsCache;
- $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+ $extrafieldOutputContent = '';
+ if (isset($object->array_options[$extrafieldOptionsKey])) $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 3f53c3c4e94..93d125291ef 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -865,7 +865,7 @@ abstract class CommonInvoice extends CommonObject
/**
- * Create a withdrawal request for a direct debit order or a credit transfer order.
+ * Create a withdrawal request at Stripe for a direct debit order or a credit transfer order.
* Use the remain to pay excluding all existing open direct debit requests.
*
* @param User $fuser User asking the direct debit transfer
@@ -900,6 +900,7 @@ abstract class CommonInvoice extends CommonObject
$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn";
$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
+ $sql .= " AND fk_facture = ".((int) $this->fk_facture); // Add a protection to not pay another invoice than current one
$sql .= " WHERE rowid = ".((int) $did);
dol_syslog(get_class($this)."::makeStripeSepaRequest 1", LOG_DEBUG);
@@ -1035,9 +1036,9 @@ abstract class CommonInvoice extends CommonObject
}
- dol_syslog("makeStripeSepaRequest get stripe account", LOG_DEBUG);
+ dol_syslog("makeStripeSepaRequest get stripe connet account", LOG_DEBUG);
$stripeacc = $stripe->getStripeAccount($service, $this->socid); // Get Stripe OAuth connect account if it exists (no network access here)
- dol_syslog("makeStripeSepaRequest get stripe account return " . json_encode($stripeacc), LOG_DEBUG);
+ dol_syslog("makeStripeSepaRequest get stripe connect account return " . json_encode($stripeacc), LOG_DEBUG);
if ($foundalternativestripeaccount) {
if (empty($stripeacc)) { // If the Stripe connect account not set, we use common API usage
@@ -1072,101 +1073,64 @@ abstract class CommonInvoice extends CommonObject
}
if (!$error) { // Payment was not canceled
- //erics card or sepa ?
$sepaMode = false;
+ $stripecard = null;
if ($companypaymentmode->type == 'ban') {
$sepaMode = true;
$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
- } else {
- $stripecard = $stripe->cardStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
}
- if ($stripecard) { // Can be card_... (old mode) or pm_... (new mode)
+ if ($stripecard) { // Can be src_... (for sepa) - Other card_... (old mode) or pm_... (new mode) should not happen here.
$FULLTAG = 'INV=' . $this->id . '-CUS=' . $thirdparty->id;
- $description = 'Stripe payment from doTakePaymentStripeForThirdparty: ' . $FULLTAG . ' ref=' . $this->ref;
+ $description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' ref=' . $this->ref;
$stripefailurecode = '';
$stripefailuremessage = '';
$stripefailuredeclinecode = '';
- if (preg_match('/^card_/', $stripecard->id)) { // Using old method
- dol_syslog("* Create charge on card " . $stripecard->id . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
+ // Using new SCA method
+ dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
- $ipaddress = getUserRemoteIP();
+ // Create payment intent and charge payment (confirmnow = true)
+ $paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
- $charge = null; // Force reset of $charge, so, if already set from a previous fetch, it will be empty even if there is an exception at next step
- try {
- $charge = \Stripe\Charge::create([
- 'amount' => price2num($amountstripe, 'MU'),
- 'currency' => $currency,
- 'capture' => true, // Charge immediatly
- 'description' => $description,
- 'metadata' => ["FULLTAG" => $FULLTAG, 'Recipient' => $mysoc->name, 'dol_version' => DOL_VERSION, 'dol_entity' => $conf->entity, 'ipaddress' => $ipaddress],
- 'customer' => $customer->id,
- //'customer' => 'bidon_to_force_error', // To use to force a stripe error
- 'source' => $stripecard,
- 'statement_descriptor' => dol_trunc('INV=' . $this->id, 10, 'right', 'UTF-8', 1), // 22 chars that appears on bank receipt (company + description)
- ]);
- } catch (\Stripe\Error\Card $e) {
- // Since it's a decline, Stripe_CardError will be caught
- $body = $e->getJsonBody();
- $err = $body['error'];
+ $charge = new stdClass();
+ //erics add processing sepa is like success ?
+ if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
+ $charge->status = 'ok';
+ $charge->id = $paymentintent->id;
+ $charge->customer = $customer->id;
+ } elseif ($paymentintent->status === 'requires_action') {
+ //paymentintent->status may be => 'requires_action' (no error in such a case)
+ dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
- $stripefailurecode = $err['code'];
- $stripefailuremessage = $err['message'];
- $stripefailuredeclinecode = $err['decline_code'];
- } catch (Exception $e) {
- $stripefailurecode = 'UnknownChargeError';
- $stripefailuremessage = $e->getMessage();
- }
- } else { // Using new SCA method
- if ($sepaMode) {
- dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
- } else {
- dol_syslog("* Create payment on card " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
- }
+ $charge->status = 'failed';
+ $charge->customer = $customer->id;
+ $charge->failure_code = $stripe->code;
+ $charge->failure_message = $stripe->error;
+ $charge->failure_declinecode = $stripe->declinecode;
+ $stripefailurecode = $stripe->code;
+ $stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
+ $stripefailuredeclinecode = $stripe->declinecode;
+ } else {
+ dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
- // Create payment intent and charge payment (confirmnow = true)
- $paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $invoice, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
-
- $charge = new stdClass();
- //erics add processing sepa is like success ?
- if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
- $charge->status = 'ok';
- $charge->id = $paymentintent->id;
- $charge->customer = $customer->id;
- } elseif ($paymentintent->status === 'requires_action') {
- //paymentintent->status may be => 'requires_action' (no error in such a case)
- dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
-
- $charge->status = 'failed';
- $charge->customer = $customer->id;
- $charge->failure_code = $stripe->code;
- $charge->failure_message = $stripe->error;
- $charge->failure_declinecode = $stripe->declinecode;
- $stripefailurecode = $stripe->code;
- $stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
- $stripefailuredeclinecode = $stripe->declinecode;
- } else {
- dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
-
- $charge->status = 'failed';
- $charge->customer = $customer->id;
- $charge->failure_code = $stripe->code;
- $charge->failure_message = $stripe->error;
- $charge->failure_declinecode = $stripe->declinecode;
- $stripefailurecode = $stripe->code;
- $stripefailuremessage = $stripe->error;
- $stripefailuredeclinecode = $stripe->declinecode;
- }
-
- //var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);
- //exit;
+ $charge->status = 'failed';
+ $charge->customer = $customer->id;
+ $charge->failure_code = $stripe->code;
+ $charge->failure_message = $stripe->error;
+ $charge->failure_declinecode = $stripe->declinecode;
+ $stripefailurecode = $stripe->code;
+ $stripefailuremessage = $stripe->error;
+ $stripefailuredeclinecode = $stripe->declinecode;
}
+ //var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);
+ //exit;
+
// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
if (empty($charge) || $charge->status == 'failed') {
- dol_syslog('Failed to charge card or payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
+ dol_syslog('Failed to charge payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
// Save a stripe payment was in error
$this->stripechargeerror++;
@@ -1202,20 +1166,20 @@ abstract class CommonInvoice extends CommonObject
$errmsg .= ($stripefailuredeclinecode ? ' - ' . $stripefailuredeclinecode : '');
}
- $description = 'Stripe payment ERROR from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+ $description = 'Stripe payment ERROR from makeStripeSepaRequest: ' . $FULLTAG;
$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
$this->errors[] = $errmsg;
} else {
- dol_syslog('Successfuly charge card ' . $stripecard->id);
+ dol_syslog('Successfuly charge direct debit ' . $stripecard->id);
- $postactionmessages[] = 'Success to charge card (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+ $postactionmessages[] = 'Success to charge direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
$this->stripechargedone++;
// Default description used for label of event. Will be overwrite by another value later.
- $description = 'Stripe payment OK (' . $charge->id . ') from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+ $description = 'Stripe payment OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
$db = $this->db;
@@ -1300,13 +1264,8 @@ abstract class CommonInvoice extends CommonObject
if (!$errorforinvoice && isModEnabled('banque')) {
dol_syslog('* Add payment to bank');
+ // The bank used is the one defined into Stripe setup
$bankaccountid = 0;
- if ($paymentmethod == 'paybox') {
- $bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
- }
- if ($paymentmethod == 'paypal') {
- $bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
- }
if ($paymentmethod == 'stripe') {
$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
}
@@ -1323,7 +1282,7 @@ abstract class CommonInvoice extends CommonObject
$error++;
$errorforinvoice++;
} else {
- $postactionmessages[] = 'Bank transaction of payment created (by doTakePaymentStripeForThirdparty)';
+ $postactionmessages[] = 'Bank transaction of payment created (by makeStripeSepaRequest)';
}
} else {
$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
@@ -1334,13 +1293,13 @@ abstract class CommonInvoice extends CommonObject
}
if ($ispostactionok < 1) {
- $description = 'Stripe payment OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') but post action KO from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+ $description = 'Stripe payment OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') but post action KO from makeStripeSepaRequest: ' . $FULLTAG;
} else {
- $description = 'Stripe payment+post action OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') from doTakePaymentStripeForThirdparty: ' . $FULLTAG;
+ $description = 'Stripe payment+post action OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') from makeStripeSepaRequest: ' . $FULLTAG;
}
}
- $object = $invoice;
+ $object = $this;
// Send emails
$labeltouse = 'InvoicePaymentSuccess';
@@ -1366,8 +1325,8 @@ abstract class CommonInvoice extends CommonObject
} else {
$error++;
$errorforinvoice++;
- dol_syslog("No card or payment method found for this stripe customer " . $customer->id, LOG_WARNING);
- $this->errors[] = 'Failed to get card | payment method for stripe customer = ' . $customer->id;
+ dol_syslog("No direct debit payment method found for this stripe customer " . $customer->id, LOG_WARNING);
+ $this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
$labeltouse = 'InvoicePaymentFailure';
$sendemailtocustomer = 1;
@@ -1380,7 +1339,7 @@ abstract class CommonInvoice extends CommonObject
$stripefailuremessage = 'Failed to find or use the payment mode - no credit card defined for the customer account';
$postactionmessages[] = $description . ' (' . $stripearrayofkeys['publishable_key'] . ')';
- $object = $invoice;
+ $object = $this;
$actioncode = 'PAYMENT_STRIPE_KO';
$extraparams = '';
@@ -1394,7 +1353,7 @@ abstract class CommonInvoice extends CommonObject
$stripefailurecode = '';
$stripefailuremessage = '';
- $object = $invoice;
+ $object = $this;
$actioncode = '';
$extraparams = '';
@@ -1421,12 +1380,13 @@ abstract class CommonInvoice extends CommonObject
$stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';
$postactionmessages = [];
- $object = $invoice;
+ $object = $this;
$actioncode = 'PAYMENT_STRIPE_KO';
$extraparams = '';
}
+ /*
// Send email + create action after
if ($sendemailtocustomer && $labeltouse) {
dol_syslog("* Send email with result of payment - " . $labeltouse);
@@ -1537,6 +1497,7 @@ abstract class CommonInvoice extends CommonObject
}
}
}
+ */
if ($description) {
dol_syslog("* Record event for payment result - " . $description);
@@ -1588,18 +1549,12 @@ abstract class CommonInvoice extends CommonObject
$this->errors[] = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";
}
- $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_demande(";
- $sql .= "fk_facture, ";
- $sql .= " amount, date_demande, fk_user_demande, ext_payment_id, ext_payment_site, sourcetype, entity)";
- $sql .= " VALUES (".$this->id;
- $sql .= ",".((float) price2num($amount));
- $sql .= ",'".$this->db->idate($now)."'";
- $sql .= ",".((int) $fuser->id);
- $sql .= ",'".$this->db->escape($stripe_id)."'";
- $sql .= ",'".$this->db->escape($stripe_uri)."'";
- $sql .= ",'".$this->db->escape($sourcetype)."'";
- $sql .= ",".$conf->entity;
- $sql .= ")";
+ // TODO Create a prelevement_bon ?
+ // For the moment no
+
+ // We must update the direct debit payment request as "done"
+ $sql = "UPDATE".MAIN_DB_PREFIX."prelevement_demande SET traite = 1, date_traite = '".$this->db->idate(dol_now())."'";
+ $sql .= "WHERE rowid = ".((int) $did);
dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);
$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a23c0611589..d6be7c463a1 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -16,6 +16,7 @@
* Copyright (C) 2018 Josep Lluís Amador
* Copyright (C) 2021 Gauthier VERDOL
* Copyright (C) 2021 Grégory Blémand
+ * Copyright (C) 2023 Lenin Rivas
*
* 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
@@ -5740,15 +5741,16 @@ abstract class CommonObject
*
* @param string $fieldname Name of field
* @param string $alternatevalue Alternate value to use
+ * @param string $type Type of data
* @return string|string[] Default value (can be an array if the GETPOST return an array)
**/
- public function getDefaultCreateValueFor($fieldname, $alternatevalue = null)
+ public function getDefaultCreateValueFor($fieldname, $alternatevalue = null, $type = 'alphanohtml')
{
global $conf, $_POST;
// If param here has been posted, we use this value first.
if (GETPOSTISSET($fieldname)) {
- return GETPOST($fieldname, 'alphanohtml', 3);
+ return GETPOST($fieldname, $type, 3);
}
if (isset($alternatevalue)) {
@@ -8581,21 +8583,21 @@ abstract class CommonObject
/**
* Show photos of an object (nbmax maximum), into several columns
*
- * @param string $modulepart 'product', 'ticket', ...
- * @param string $sdir Directory to scan (full absolute path)
- * @param int $size 0=original size, 1='small' use thumbnail if possible
- * @param int $nbmax Nombre maximum de photos (0=pas de max)
- * @param int $nbbyrow Number of image per line or -1 to use div separator or 0 to use no separator. Used only if size=1 or 'small'.
- * @param int $showfilename 1=Show filename
- * @param int $showaction 1=Show icon with action links (resize, delete)
- * @param int $maxHeight Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
- * @param int $maxWidth Max width of original image when size='small'
- * @param int $nolink Do not add a href link to view enlarged imaged into a new tab
- * @param int $notitle Do not add title tag on image
- * @param int $usesharelink Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
- * @return string Html code to show photo. Number of photos shown is saved in this->nbphoto
+ * @param string $modulepart 'product', 'ticket', ...
+ * @param string $sdir Directory to scan (full absolute path)
+ * @param int $size 0=original size, 1='small' use thumbnail if possible
+ * @param int $nbmax Nombre maximum de photos (0=pas de max)
+ * @param int $nbbyrow Number of image per line or -1 to use div separator or 0 to use no separator. Used only if size=1 or 'small'.
+ * @param int $showfilename 1=Show filename
+ * @param int $showaction 1=Show icon with action links (resize, delete)
+ * @param int $maxHeight Max height of original image when size='small' (so we can use original even if small requested). If 0, always use 'small' thumb image.
+ * @param int $maxWidth Max width of original image when size='small'
+ * @param int $nolink Do not add a href link to view enlarged imaged into a new tab
+ * @param int|string $overwritetitle Do not add title tag on image
+ * @param int $usesharelink Use the public shared link of image (if not available, the 'nophoto' image will be shown instead)
+ * @return string Html code to show photo. Number of photos shown is saved in this->nbphoto
*/
- public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $notitle = 0, $usesharelink = 0)
+ public function show_photos($modulepart, $sdir, $size = 0, $nbmax = 0, $nbbyrow = 5, $showfilename = 0, $showaction = 0, $maxHeight = 120, $maxWidth = 160, $nolink = 0, $overwritetitle = 0, $usesharelink = 0)
{
// phpcs:enable
global $conf, $user, $langs;
@@ -8698,8 +8700,12 @@ abstract class CommonObject
// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
- if ($notitle) {
- $alt = '';
+ if ($overwritetitle) {
+ if (is_numeric($overwritetitle)) {
+ $alt = '';
+ } else {
+ $alt = $overwritetitle;
+ }
}
$addphotorefcss = 1;
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index a2eea7023d9..e5001270131 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -144,10 +144,12 @@ class DolGeoIP
return '';
}
} else {
- if (!function_exists('geoip_country_code_by_addr_v6')) {
+ if (function_exists('geoip_country_code_by_addr_v6')) {
+ return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
+ } elseif (function_exists('geoip_country_code_by_name_v6')) {
return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
}
- return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
+ return '';
}
}
}
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 0659240c8c7..bcd5a506946 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -162,84 +162,44 @@ class HookManager
//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
// Define type of hook ('output' or 'addreplace').
- // TODO Remove hooks with type 'output' (exemple getNomUrl). All hooks must be converted into 'addreplace' hooks.
- $hooktype = 'output';
- if (in_array(
- $method,
- array(
- 'addCalendarChoice',
- 'addCalendarView',
- 'addMoreActionsButtons',
- 'addMoreMassActions',
- 'addSearchEntry',
- 'addStatisticLine',
- 'addSectionECMAuto',
- 'checkSecureAccess',
- 'createDictionaryFieldlist',
- 'editDictionaryFieldlist',
- 'getFormMail',
- 'deleteFile',
- 'doActions',
- 'doMassActions',
- 'formatEvent',
- 'formConfirm',
- 'formCreateThirdpartyOptions',
- 'formObjectOptions',
- 'formattachOptions',
- 'formBuilddocLineOptions',
- 'formatNotificationMessage',
- 'formConfirm',
- 'getAccessForbiddenMessage',
- 'getDirList',
- 'hookGetEntity',
- 'getFormMail',
- 'getFormatedCustomerRef',
- 'getFormatedSupplierRef',
- 'getIdProfUrl',
- 'getInputIdProf',
- 'isPaymentOK',
- 'llxFooter',
- 'menuDropdownQuickaddItems',
- 'menuLeftMenuItems',
- 'moveUploadedFile',
- 'moreHtmlStatus',
- 'pdf_build_address',
- 'pdf_writelinedesc',
- 'pdf_getlinenum',
- 'pdf_getlineref',
- 'pdf_getlineref_supplier',
- 'pdf_getlinevatrate',
- 'pdf_getlineupexcltax',
- 'pdf_getlineupwithtax',
- 'pdf_getlineqty',
- 'pdf_getlineqty_asked',
- 'pdf_getlineqty_shipped',
- 'pdf_getlineqty_keeptoship',
- 'pdf_getlineunit',
- 'pdf_getlineremisepercent',
- 'pdf_getlineprogress',
- 'pdf_getlinetotalexcltax',
- 'pdf_getlinetotalwithtax',
- 'paymentsupplierinvoices',
- 'printAddress',
- 'printEmail',
- 'printSearchForm',
- 'printTabsHead',
- 'printObjectLine',
- 'printObjectSubLine',
- 'restrictedArea',
- 'sendMail',
- 'sendMailAfter',
- 'showOptionals',
- 'showLinkToObjectBlock',
- 'setContentSecurityPolicy',
- 'setHtmlTitle',
- 'completeTabsHead',
- 'formDolBanner',
- 'displayMarginInfos',
- )
- )) {
- $hooktype = 'addreplace';
+ $hooktype = 'addreplace';
+ // TODO Remove hooks with type 'output' (exemple createFrom). All hooks must be converted into 'addreplace' hooks.
+ if (in_array($method, array(
+ 'createFrom',
+ 'dashboardMembers',
+ 'dashboardEmailings',
+ 'dashboardPropals',
+ 'dashboardPropals',
+ 'dashboardCommercials',
+ 'dashboardOrders',
+ 'dashboardSpecialBills',
+ 'dashboardAccountancy',
+ 'dashboardContracts',
+ 'dashboardDonation',
+ 'dashboardWarehouseSendings',
+ 'dashboardExpenseReport',
+ 'dashboardInterventions',
+ 'dashboardOrdersSuppliers',
+ 'dashboardHRM',
+ 'dashboardMRP',
+ 'dashboardOpensurvey',
+ 'dashboardWarehouse',
+ 'dashboardProductServices',
+ 'dashboardActivities',
+ 'dashboardProjects',
+ 'dashboardWarehouseReceptions',
+ 'dashboardThirdparties',
+ 'dashboardSupplierProposal',
+ 'dashboardTickets',
+ 'dashboardUsersGroups',
+ 'insertExtraHeader',
+ 'insertExtraFooter',
+ 'printLeftBlock',
+ 'formAddObjectLine',
+ 'formBuilddocOption',
+ 'showSocinfoOnPrint'
+ ))) {
+ $hooktype = 'output';
}
// Init return properties
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1c54df24e06..276f7bacd69 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -2137,10 +2137,7 @@ class Form
$out .= ' selected';
}
$out .= ' data-html="';
- $outhtml = '';
- // if (!empty($obj->photo)) {
- $outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
- // }
+ $outhtml = $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
if ($showstatus >= 0 && $obj->status == 0) {
$outhtml .= '';
}
@@ -2344,11 +2341,7 @@ class Form
}
}
// mode=1 means customers products
- $urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&status_purchase='.$status_purchase.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
- //Price by customer
- if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
- $urloption .= '&socid='.$socid;
- }
+ $urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&status_purchase='.$status_purchase.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, $ajaxoptions);
if (isModEnabled('variants') && is_array($selected_combinations)) {
@@ -3247,6 +3240,7 @@ class Form
// mode=2 means suppliers products
$urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;
print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+
print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'';
} else {
print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', $status, 0, 0, $alsoproductwithnosupplierprice, $morecss, 0, $placeholder);
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index a0d0dd2758e..2cc15a3dd42 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -36,7 +36,7 @@ class FormAdmin
/**
* Constructor
*
- * @param DoliDB $db Database handler
+ * @param DoliDB|null $db Database handler
*/
public function __construct($db)
{
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 7f5c2887e8b..b2bb2a5f8fa 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -449,6 +449,15 @@ class FormFile
$titletoshow = ($title == 'none' ? '' : $title);
}
+ $submodulepart = $modulepart;
+
+ // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
+ $tmp = explode(':', $modulepart);
+ if (!empty($tmp[1])) {
+ $modulepart = $tmp[0];
+ $submodulepart = $tmp[1];
+ }
+
// Show table
if ($genallowed) {
$modellist = array();
@@ -648,15 +657,6 @@ class FormFile
$modellist = ModelePDFUserGroup::liste_modeles($this->db);
}
} else {
- $submodulepart = $modulepart;
-
- // modulepart = 'nameofmodule' or 'nameofmodule:NameOfObject'
- $tmp = explode(':', $modulepart);
- if (!empty($tmp[1])) {
- $modulepart = $tmp[0];
- $submodulepart = $tmp[1];
- }
-
// For normalized standard modules
$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
if (file_exists($file)) {
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index c8dbca747b9..60cdc5d5226 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -237,7 +237,7 @@ abstract class Stats
/**
* @param int $year year number
- * @return int value
+ * @return array array of values
*/
protected abstract function getAverageByMonth($year);
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 3f2f756977d..2315428b37a 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -932,8 +932,10 @@ class Translate
$fonc = 'numberwords';
if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) {
include_once $newdir.'/functions_'.$fonc.'.lib.php';
- $newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
- break;
+ if (function_exists('numberwords_getLabelFromNumber')) {
+ $newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
+ break;
+ }
}
}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index d58854ed9d0..0241431c8b7 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -34,6 +34,9 @@ class Utils
*/
public $db;
+ public $error;
+ public $errors;
+
public $output; // Used by Cron method to return message
public $result; // Used by Cron method to return data
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 8a62c0aea5e..7b5a320f678 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -31,7 +31,7 @@
*/
function encode($string)
{
- return str_replace(";", "\;", (dol_quoted_printable_encode(utf8_decode($string))));
+ return str_replace(";", "\;", (dol_quoted_printable_encode($string)));
}
@@ -117,22 +117,25 @@ class vCard
if ($type != "") {
$key .= ";".$type;
}
- $key .= ";".$this->encoding;
- $this->properties[$key] = 'VALUE=uri:tel:'.encode($number);
+ $key .= ";VALUE=uri";
+ //$key .= ";".$this->encoding;
+ $this->properties[$key] = 'tel:'.$number;
}
/**
* mise en forme de la photo
* warning NON TESTE !
*
- * @param string $type Type 'image/gif'
+ * @param string $type Type 'image/jpeg' or 'JPEG'
* @param string $photo Photo
* @return void
*/
public function setPhoto($type, $photo)
{
// $type = "GIF" | "JPEG"
- $this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+ //$this->properties["PHOTO;MEDIATYPE=$type;ENCODING=BASE64"] = base64_encode($photo);
+ $this->properties["PHOTO;MEDIATYPE=$type"] = $photo; // must be url of photo
+ //$this->properties["PHOTO;TYPE=$type;ENCODING=BASE64"] = base64_encode($photo); // must be content of image
}
/**
@@ -152,13 +155,14 @@ class vCard
* @param string $family Family name
* @param string $first First name
* @param string $additional Additional (e.g. second name, nick name)
- * @param string $prefix Prefix (e.g. "Mr.", "Ms.", "Prof.")
+ * @param string $prefix Title prefix (e.g. "Mr.", "Ms.", "Prof.")
* @param string $suffix Suffix (e.g. "sen." for senior, "jun." for junior)
* @return void
*/
public function setName($family = "", $first = "", $additional = "", $prefix = "", $suffix = "")
{
- $this->properties["N;".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+ //$this->properties["N;".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
+ $this->properties["N"] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
$this->filename = "$first%20$family.vcf";
if (empty($this->properties["FN"])) {
$this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
@@ -173,12 +177,13 @@ class vCard
*/
public function setBirthday($date)
{
- // $date format is YYYY-MM-DD - RFC 2425 and RFC 2426
- $this->properties["BDAY"] = dol_print_date($date, 'dayrfc');
+ // $date format is YYYY-MM-DD - RFC 2425 and RFC 2426 for vcard v3
+ // $date format is YYYYMMDD or ISO8601 for vcard v4
+ $this->properties["BDAY"] = dol_print_date($date, 'dayxcard');
}
/**
- * mise en forme de l'adresse
+ * Address
*
* @param string $postoffice Postoffice
* @param string $extended Extended
@@ -191,7 +196,7 @@ class vCard
* @param string $label Label
* @return void
*/
- public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME", $label = '')
+ public function setAddress($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "", $label = "")
{
// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
$key = "ADR";
@@ -202,7 +207,7 @@ class vCard
$key .= ';LABEL="'.encode($label).'"';
}
$key .= ";".$this->encoding;
- $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
+ $this->properties[$key] = encode($postoffice).";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
//if ($this->properties["LABEL;".$type.";".$this->encoding] == '') {
//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
@@ -210,7 +215,7 @@ class vCard
}
/**
- * mise en forme du label
+ * Address (old standard)
*
* @param string $postoffice Postoffice
* @param string $extended Extended
@@ -221,6 +226,7 @@ class vCard
* @param string $country Country
* @param string $type Type
* @return void
+ * @deprecated
*/
public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME")
{
@@ -309,7 +315,7 @@ class vCard
*/
public function setProdId($prodid)
{
- $this->properties["PRODID;".$this->encoding] = encode($prodid);
+ $this->properties["PRODID"] = encode($prodid);
}
@@ -321,7 +327,7 @@ class vCard
*/
public function setUID($uid)
{
- $this->properties["UID;".$this->encoding] = encode($uid);
+ $this->properties["UID"] = encode($uid);
}
@@ -353,9 +359,10 @@ class vCard
$text .= "VERSION:4.0\r\n"; // With V4, all encoding are UTF-8
//$text.= "VERSION:2.1\r\n";
foreach ($this->properties as $key => $value) {
- $text .= $key.":".$value."\r\n";
+ $newkey = preg_replace('/-.*$/', '', $key); // remove suffix -twitter, -facebook, ...
+ $text .= $newkey.":".$value."\r\n";
}
- $text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
+ $text .= "REV:".date("Ymd")."T".date("His")."Z\r\n";
//$text .= "MAILER: Dolibarr\r\n";
$text .= "END:VCARD\r\n";
return $text;
@@ -373,13 +380,15 @@ class vCard
/**
* Return a VCARD string
+ * See RFC https://datatracker.ietf.org/doc/html/rfc6350
*
- * @param Object $object Object (User, Contact)
- * @param Societe $company Company
- * @param Translate $langs Lang object
- * @return string String
+ * @param Object $object Object (User or Contact)
+ * @param Societe|null $company Company. May be null
+ * @param Translate $langs Lang object
+ * @param string $urlphoto Full public URL of photo
+ * @return string String
*/
- public function buildVCardString($object, $company, $langs)
+ public function buildVCardString($object, $company, $langs, $urlphoto = '')
{
global $dolibarr_main_instance_unique_id;
@@ -389,70 +398,136 @@ class vCard
$this->setName($object->lastname, $object->firstname, "", $object->civility_code, "");
$this->setFormattedName($object->getFullName($langs, 1));
- $this->setPhoneNumber($object->office_phone, "TYPE=WORK,VOICE");
- $this->setPhoneNumber($object->personal_mobile, "TYPE=HOME,VOICE");
- $this->setPhoneNumber($object->user_mobile, "TYPE=CELL,VOICE");
- $this->setPhoneNumber($object->office_fax, "TYPE=WORK,FAX");
-
- $country = $object->country_code ? $object->country : '';
-
- $this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
- //$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=WORK");
-
- $this->setEmail($object->email, "TYPE=WORK");
- $this->setNote($object->note_public);
- $this->setTitle($object->job);
-
- // For user, type=home
- // For contact, this is not defined
- $this->setURL($object->url, "TYPE=HOME");
-
- if (is_object($company)) {
- $this->setURL($company->url, "TYPE=WORK");
-
- if (!$object->office_phone) {
- $this->setPhoneNumber($company->phone, "TYPE=WORK,VOICE");
- }
- if (!$object->office_fax) {
- $this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");
- }
- if (!$object->zip) {
- $this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");
- }
-
- // when company e-mail is empty, use only user e-mail
- if (empty(trim($company->email))) {
- // was set before, don't set twice
- } elseif (empty(trim($object->email))) {
- // when user e-mail is empty, use only company e-mail
- $this->setEmail($company->email, "TYPE=WORK");
- } else {
- $tmpuser2 = explode("@", trim($object->email));
- $tmpcompany = explode("@", trim($company->email));
-
- if (strtolower(end($tmpuser2)) == strtolower(end($tmpcompany))) {
- // when e-mail domain of user and company are the same, use user e-mail at first (and company e-mail at second)
- $this->setEmail($object->email, "TYPE=WORK");
-
- // support by Microsoft Outlook (2019 and possible earlier)
- $this->setEmail($company->email, '');
- } else {
- // when e-mail of user and company complete different use company e-mail at first (and user e-mail at second)
- $this->setEmail($company->email, "TYPE=WORK");
-
- // support by Microsoft Outlook (2019 and possible earlier)
- $this->setEmail($object->email, '');
- }
- }
-
- // Si user lie a un tiers non de type "particulier"
- if ($company->typent_code != 'TE_PRIVATE') {
- $this->setOrg($company->name);
+ if ($urlphoto) {
+ $mimetype = dol_mimetype($urlphoto);
+ if ($mimetype) {
+ $this->setPhoto($mimetype, $urlphoto);
}
}
- // Personal informations
- $this->setPhoneNumber($object->personal_mobile, "TYPE=HOME,VOICE");
+ if ($object->office_phone) {
+ $this->setPhoneNumber($object->office_phone, "TYPE=WORK,VOICE");
+ }
+ /* disabled
+ if ($object->personal_mobile) {
+ $this->setPhoneNumber($object->personal_mobile, "TYPE=CELL,VOICE");
+ }*/
+ if ($object->user_mobile) {
+ $this->setPhoneNumber($object->user_mobile, "TYPE=CELL,VOICE");
+ }
+ if ($object->office_fax) {
+ $this->setPhoneNumber($object->office_fax, "TYPE=WORK,FAX");
+ }
+
+ if (!empty($object->socialnetworks)) {
+ foreach ($object->socialnetworks as $key => $val) {
+ $urlsn = '';
+ if ($key == 'linkedin') {
+ if (!preg_match('/^http/', $val)) {
+ $urlsn = 'https://www.'.$key.'.com/company/'.urlencode($val);
+ } else {
+ $urlsn = $val;
+ }
+ } elseif ($key == 'youtube') {
+ if (!preg_match('/^http/', $val)) {
+ $urlsn = 'https://www.'.$key.'.com/user/'.urlencode($val);
+ } else {
+ $urlsn = $val;
+ }
+ } else {
+ if (!preg_match('/^http/', $val)) {
+ $urlsn = 'https://www.'.$key.'.com/'.urlencode($val);
+ } else {
+ $urlsn = $val;
+ }
+ }
+ if ($urlsn) {
+ $this->properties["SOCIALPROFILE;TYPE=WORK-".$key] = $key.':'.$urlsn;
+ }
+ }
+ }
+
+ $country = $object->country_code ? $object->country : '';
+
+ if ($object->address || $object->town || $object->state || $object->zip || $object->country) {
+ $this->setAddress("", "", $object->address, $object->town, $object->state, $object->zip, $country, "");
+ //$this->setLabel("", "", $object->address, $object->town, $object->state, $object->zip, $country, "TYPE=HOME");
+ }
+
+ if ($object->email) {
+ $this->setEmail($object->email, "TYPE=WORK");
+ }
+ /* disabled
+ if ($object->personal_email) {
+ $this->setEmail($object->personal_email, "TYPE=HOME");
+ } */
+ if ($object->note_public) {
+ $this->setNote($object->note_public);
+ }
+ if ($object->job) {
+ $this->setTitle($object->job);
+ }
+
+ // For user, $object->url is not defined
+ // For contact, $object->url is not defined
+ if (!empty($object->url)) {
+ $this->setURL($object->url, "");
+ }
+
+ if (is_object($company)) {
+ // Si user linked to a thirdparty and not a physical people
+ if ($company->typent_code != 'TE_PRIVATE') {
+ $this->setOrg($company->name);
+ }
+
+ $this->setURL($company->url, "");
+
+ if ($company->phone && $company->phone != $object->office_phone) {
+ $this->setPhoneNumber($company->phone, "TYPE=WORK,VOICE");
+ }
+ if ($company->fax && $company->fax != $object->office_fax) {
+ $this->setPhoneNumber($company->fax, "TYPE=WORK,FAX");
+ }
+ if ($company->address || $company->town || $company->state || $company->zip || $company->country) {
+ $this->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK");
+ }
+
+ if ($company->email && $company->email != $object->email) {
+ $this->setEmail($company->email, "TYPE=WORK");
+ }
+
+ /*
+ if (!empty($company->socialnetworks)) {
+ foreach ($company->socialnetworks as $key => $val) {
+ $urlsn = '';
+ if ($key == 'linkedin') {
+ if (!preg_match('/^http/', $val)) {
+ $urlsn = 'https://www.'.$key.'.com/company/'.urlencode($val);
+ } else {
+ $urlsn = $val;
+ }
+ } elseif ($key == 'youtube') {
+ if (!preg_match('/^http/', $val)) {
+ $urlsn = 'https://www.'.$key.'.com/user/'.urlencode($val);
+ } else {
+ $urlsn = $val;
+ }
+ } else {
+ if (!preg_match('/^http/', $val)) {
+ $urlsn = 'https://www.'.$key.'.com/'.urlencode($val);
+ } else {
+ $urlsn = $val;
+ }
+ }
+ if ($urlsn) {
+ $this->properties["socialProfile;type=".$key] = $urlsn;
+ }
+ }
+ }
+ */
+ }
+
+ // Birthday
if ($object->birth) {
$this->setBirthday($object->birth);
}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 71bcc082961..92895793082 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1084,11 +1084,12 @@ function purgeSessions($mysessionid)
/**
* Enable a module
*
- * @param string $value Name of module to activate
- * @param int $withdeps Activate/Disable also all dependencies
- * @return array array('nbmodules'=>nb modules activated with success, 'errors=>array of error messages, 'nbperms'=>Nb permission added);
+ * @param string $value Name of module to activate
+ * @param int $withdeps Activate/Disable also all dependencies
+ * @param int $noconfverification Remove verification of $conf variable for module
+ * @return array array('nbmodules'=>nb modules activated with success, 'errors=>array of error messages, 'nbperms'=>Nb permission added);
*/
-function activateModule($value, $withdeps = 1)
+function activateModule($value, $withdeps = 1, $noconfverification = 0)
{
global $db, $langs, $conf, $mysoc;
@@ -1144,8 +1145,10 @@ function activateModule($value, $withdeps = 1)
}
$const_name = $objMod->const_name;
- if (!empty($conf->global->$const_name)) {
- return $ret;
+ if ($noconfverification == 0) {
+ if (!empty($conf->global->$const_name)) {
+ return $ret;
+ }
}
$result = $objMod->init(); // Enable module
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d49538f41dc..a29c22cbcf7 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -957,7 +957,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
$search_poste = GETPOST("search_poste", 'alpha');
$search_note_private = GETPOST('search_note_private', 'alphanohtml');
$search_roles = GETPOST("search_roles", 'array');
+ $search_birthday_dtstart = GETPOST("search_birthday_dtstart", 'alpha');
+ $search_birthday_dtend = GETPOST("search_birthday_dtend", 'alpha');
+ if ($search_birthday_dtstart != '' || $search_birthday_dtend != '') {
+ $search_birthday_dtstart = dol_mktime(0, 0, 0, GETPOST('search_birthday_dtstartmonth', 'int'), GETPOST('search_birthday_dtstartday', 'int'), GETPOST('search_birthday_dtstartyear', 'int'));
+ $search_birthday_dtend = dol_mktime(23, 59, 59, GETPOST('search_birthday_dtendmonth', 'int'), GETPOST('search_birthday_dtendday', 'int'), GETPOST('search_birthday_dtendyear', 'int'));
+ }
$socialnetworks = getArrayOfSocialNetworks();
$searchAddressPhoneDBFields = array(
@@ -1007,6 +1013,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
'address' =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>3, 'index'=>1, 'position'=>30),
'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'visible'=>3, 'position'=>35),
'role' =>array('type'=>'checkbox', 'label'=>'Role', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>4, 'index'=>1, 'position'=>40),
+ 'birthday' =>array('type'=>'date', 'label'=>'Birthday', 'enabled'=>1, 'visible'=>-1, 'notnull'=> 0, 'position'=>45),
'statut' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>50, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),
);
@@ -1018,6 +1025,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
't.note_private' => array('label' => 'NotePrivate', 'checked' => 0, 'position'=>35),
'sc.role'=>array('label'=>"ContactByDefaultFor", 'checked'=>1, 'position'=>40),
+ 't.birthday'=>array('label'=>"Birthday", 'checked'=>0, 'position'=>45),
't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>50, 'class'=>'center'),
);
// Extra fields
@@ -1052,6 +1060,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
$search_address = '';
$search_poste = '';
$search_note_private = '';
+ $search_birthday_dtstart = '';
+ $search_birthday_dtend = '';
$search = array();
$search_array_options = array();
@@ -1111,6 +1121,9 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
if ($search_note_private != '') {
$param .= '&search_note_private='.urlencode($search_note_private);
}
+ if ($search_birthday != '') {
+ $param .= '&search_birthday='.urlencode($search_birthday);
+ }
if ($optioncss != '') {
$param .= '&optioncss='.urlencode($optioncss);
}
@@ -1120,7 +1133,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
$sql = "SELECT t.rowid, t.entity, t.lastname, t.firstname, t.fk_pays as country_id, t.civility, t.poste, t.phone as phone_pro, t.phone_mobile, t.phone_perso, t.fax, t.email, t.socialnetworks, t.statut, t.photo,";
- $sql .= " t.civility as civility_id, t.address, t.zip, t.town";
+ $sql .= " t.civility as civility_id, t.address, t.zip, t.town, t.birthday";
$sql .= ", t.note_private";
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
@@ -1144,6 +1157,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
if ($search_note_private) {
$sql .= natural_search('t.note_private', $search_note_private);
}
+ if ($search_birthday_dtstart != '') {
+ $sql .= " AND t.birthday >= '".$db->idate($search_birthday_dtstart)."'";
+ }
+ if ($search_birthday_dtend != '') {
+ $sql .= " AND t.birthday <= '".$db->idate($search_birthday_dtend)."'";
+ }
if (count($search_roles) > 0) {
$sql .= " AND t.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".$db->sanitize(implode(',', $search_roles))."))";
}
@@ -1188,6 +1207,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status, 0, 0, 0, '', 0, 0, 0, '', 'onrightofpage');
} elseif (in_array($key, array('role'))) {
print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles, 'minwidth200 maxwidth300');
+ } elseif (in_array($key, array('birthday'))) {
+ print '';
+ print dol_print_date($obj->birthday);
+ print ' ';
+ }
+
// Status
if (!empty($arrayfields['t.statut']['checked'])) {
print ''.$contactstatic->getLibStatut(5).' ';
@@ -1384,7 +1417,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
$i++;
}
} else {
- $colspan = 1;
+ $colspan = 2;
foreach ($arrayfields as $key => $val) {
if (!empty($val['checked'])) {
$colspan++;
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 03223a7b65a..773cb6a1a97 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -117,6 +117,7 @@ function getServerTimeZoneInt($refgmtdate = 'now')
* @param int $duration_unit Unit of added delay (d, m, y, w, h, i)
* @param int $ruleforendofmonth Change the behavior of PHP over data-interval, 0 or 1
* @return int New timestamp
+ * @see convertSecondToTime(), convertTimeToSeconds()
*/
function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforendofmonth = 0)
{
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index ad7d7cecfa5..207f5bafeb7 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2058,13 +2058,13 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
$data = implode("", file(dol_osencode($inputfile)));
- if ($mode == 'gz') {
+ if ($mode == 'gz' && function_exists('gzencode')) {
$foundhandler = 1;
$compressdata = gzencode($data, 9);
- } elseif ($mode == 'bz') {
+ } elseif ($mode == 'bz' && function_exists('bzcompress')) {
$foundhandler = 1;
$compressdata = bzcompress($data, 9);
- } elseif ($mode == 'zstd') {
+ } elseif ($mode == 'zstd' && function_exists('zstd_compress')) {
$foundhandler = 1;
$compressdata = zstd_compress($data, 9);
} elseif ($mode == 'zip') {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 30d2d2327d8..a25d083c251 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -116,7 +116,7 @@ function getDolUserString($key, $default = '', $tmpuser = null)
}
// return $conf->global->$key ?? $default;
- return (string) (empty($tmpuser->conf->$key) ? $default : $$tmpuser->conf->$key);
+ return (string) (empty($tmpuser->conf->$key) ? $default : $tmpuser->conf->$key);
}
/**
@@ -2122,14 +2122,14 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$maxvisiblephotos = 1;
}
if ($showimage) {
- $morehtmlleft .= '
';
+ $morehtmlleft .= '![]( "'.dol_escape_htmltag($langs->trans(")
transnoentitiesnoconv("Documents"))).'" alt="No photo"'.($width ? ' style="width: '.$width.'px"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
}
}
} elseif ($object->element == 'ticket') {
@@ -3170,7 +3170,7 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
if (!empty($type)) {
$htmllink = '';
+$object = new stdClass();
$parameters = array(
//'type' => $type,
'user' => $user,
);
-$reshook = $hookmanager->executeHooks('dashboardMRP', $parameters);
+$reshook = $hookmanager->executeHooks('dashboardMRP', $parameters, $object);
// End of page
llxFooter();
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 1a00a2dc052..c3ae9247c9d 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -27,6 +27,7 @@ require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
// load mrp libraries
require_once __DIR__.'/class/mo.class.php';
@@ -46,6 +47,7 @@ $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'molist'; // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode = GETPOST('mode', 'alpha');
$id = GETPOST('id', 'int');
@@ -370,6 +372,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
$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);
}
@@ -423,8 +428,12 @@ print '';
print '';
print '';
print '';
+print '';
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/mrp/mo_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/mrp/mo_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -583,6 +592,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
// Loop on record
// --------------------------------------------------------------------
+$bom = new Bom($db);
$i = 0;
$totalarray = array();
$totalarray['nbfield'] = 0;
@@ -595,94 +605,113 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
// Store properties in $object
$object->setVarsFromFetchObj($obj);
- // Show here line of result
- print '';
- // Action column
- if (getDolGlobalString('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 ' ';
- }
- 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'))) {
- $cssforfield .= ($cssforfield ? ' ' : '').'center';
- } elseif ($key == 'status') {
- $cssforfield .= ($cssforfield ? ' ' : '').'center';
- } elseif ($key == 'fk_parent_line') {
- $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ //mode Kanban
+ if ($mode == 'kanban') {
+ if ($i == 0) {
+ print ' ';
+ print ' ';
- if ($key == 'status') {
- print $object->getLibStatut(5);
- } elseif ($key == 'fk_parent_line') {
- $moparent = $object->getMoParent();
- if (is_object($moparent)) print $moparent->getNomUrl(1);
- } elseif ($key == 'rowid') {
- print $object->showOutputField($val, $key, $object->id, '');
- } else {
- print $object->showOutputField($val, $key, $object->$key, '');
+ } else {
+ // Show here line of result
+ print '';
+ // Action column
+ if (getDolGlobalString('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']++;
+ }
+ 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'))) {
+ $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ } elseif ($key == 'status') {
+ $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ } elseif ($key == 'fk_parent_line') {
+ $cssforfield .= ($cssforfield ? ' ' : '').'center';
}
- if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+ if (in_array($val['type'], array('timestamp'))) {
+ $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ } elseif ($key == 'ref') {
+ $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ }
+
+ 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 (!empty($arrayfields['t.'.$key]['checked'])) {
+ print '';
+ if ($key == 'status') {
+ print $object->getLibStatut(5);
+ } elseif ($key == 'fk_parent_line') {
+ $moparent = $object->getMoParent();
+ if (is_object($moparent)) print $moparent->getNomUrl(1);
+ } elseif ($key == 'rowid') {
+ print $object->showOutputField($val, $key, $object->id, '');
+ } else {
+ print $object->showOutputField($val, $key, $object->$key, '');
+ }
+ print '';
if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+ $totalarray['nbfield']++;
}
- if (!isset($totalarray['val'])) {
- $totalarray['val'] = array();
+ if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+ }
+ if (!isset($totalarray['val'])) {
+ $totalarray['val'] = array();
+ }
+ if (!isset($totalarray['val']['t.'.$key])) {
+ $totalarray['val']['t.'.$key] = 0;
+ }
+ $totalarray['val']['t.'.$key] += $object->$key;
}
- if (!isset($totalarray['val']['t.'.$key])) {
- $totalarray['val']['t.'.$key] = 0;
- }
- $totalarray['val']['t.'.$key] += $object->$key;
}
}
- }
- // Extra fields
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- // Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- // Action column
- if (!getDolGlobalString('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;
+ // Extra fields
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+ // Fields from hook
+ $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ // Action column
+ if (!getDolGlobalString('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 '';
+ print ' ';
+ }
+ if (!$i) {
+ $totalarray['nbfield']++;
}
- print '';
- }
- if (!$i) {
- $totalarray['nbfield']++;
- }
-
- print ' '."\n";
+ print ''."\n";
+ }
$i++;
}
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index f61e92c56f3..e07aa4ab5c5 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -103,26 +103,36 @@ if ($action == 'fetch' && !empty($id)) {
$price_level = 1;
if ($socid > 0) {
- $thirdpartytemp = new Societe($db);
- $thirdpartytemp->fetch($socid);
-
- //Load translation description and label
- if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
- $newlang = $thirdpartytemp->default_lang;
-
- if (!empty($newlang)) {
- $outputlangs = new Translate("", $conf);
- $outputlangs->setDefaultLang($newlang);
- $outdesc_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["description"])) ? $object->multilangs[$outputlangs->defaultlang]["description"] : $object->description;
- $outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
- } else {
- $outdesc_trans = $object->description;
- $outlabel_trans = $object->label;
- }
+ $needchangeaccordingtothirdparty = 0;
+ if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
+ $needchangeaccordingtothirdparty = 1;
}
+ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+ $needchangeaccordingtothirdparty = 1;
+ }
+ if ($needchangeaccordingtothirdparty) {
+ $thirdpartytemp = new Societe($db);
+ $thirdpartytemp->fetch($socid);
- if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
- $price_level = $thirdpartytemp->price_level;
+ //Load translation description and label according to thirdparty language
+ if (getDolGlobalInt('MAIN_MULTILANGS') && getDolGlobalString('PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE')) {
+ $newlang = $thirdpartytemp->default_lang;
+
+ if (!empty($newlang)) {
+ $outputlangs = new Translate("", $conf);
+ $outputlangs->setDefaultLang($newlang);
+ $outdesc_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["description"])) ? $object->multilangs[$outputlangs->defaultlang]["description"] : $object->description;
+ $outlabel_trans = (!empty($object->multilangs[$outputlangs->defaultlang]["label"])) ? $object->multilangs[$outputlangs->defaultlang]["label"] : $object->label;
+ } else {
+ $outdesc_trans = $object->description;
+ $outlabel_trans = $object->label;
+ }
+ }
+
+ //Set price level according to thirdparty
+ if (getDolGlobalString('PRODUIT_MULTIPRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES')) {
+ $price_level = $thirdpartytemp->price_level;
+ }
}
}
@@ -185,7 +195,7 @@ if ($action == 'fetch' && !empty($id)) {
}
// Price by customer
- if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
+ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') && !empty($socid)) {
require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
$prodcustprice = new Productcustomerprice($db);
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index c5b27a00c20..b91ae62f663 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -147,7 +147,6 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
$sql .= $hookmanager->resPrint;
$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid AND e.entity IN ('.getEntity('stock').')';
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
}
@@ -168,6 +167,7 @@ if (!empty($search_categ) && $search_categ != '-1') {
}
$sql .= ")";
}
+$sql .= " AND EXISTS (SELECT e.rowid FROM ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = s.fk_entrepot AND e.entity IN (".getEntity('stock')."))";
if ($sall) {
$sql .= natural_search(array('p.ref', 'p.label', 'p.description', 'p.note'), $sall);
}
@@ -363,6 +363,13 @@ if ($resql) {
// Fields title search
print '';
+ // Action column
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '';
+ $searchpicto = $form->showFilterAndCheckAddButtons(0);
+ print $searchpicto;
+ print ' ';
+ }
print '';
print '';
print ' ';
@@ -391,14 +398,20 @@ if ($resql) {
$parameters = array();
$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- print '';
- $searchpicto = $form->showFilterAndCheckAddButtons(0);
- print $searchpicto;
- print ' ';
+ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '';
+ $searchpicto = $form->showFilterAndCheckAddButtons(0);
+ print $searchpicto;
+ print ' ';
+ }
print ' ';
//Line for column titles
print "";
+ // Action column
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print_liste_field_titre('');
+ }
print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", '', $param, "", $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", '', $param, "", $sortfield, $sortorder);
if (isModEnabled("service") && $type == 1) {
@@ -429,7 +442,10 @@ if ($resql) {
$parameters = array('param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- print_liste_field_titre('');
+ // Action column
+ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print_liste_field_titre('');
+ }
print " \n";
while ($i < min($num, $limit)) {
@@ -440,6 +456,10 @@ if ($resql) {
$product->load_stock();
print '';
+ // Action column
+ if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '';
print $product->getNomUrl(1, '', 16);
//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
@@ -504,7 +524,11 @@ if ($resql) {
$parameters = array('obj'=>$objp);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $product); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- print ' \n";
$i++;
}
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index 40c8fcf4292..c07f0785e2c 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -227,7 +227,7 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps on p.rowid = ps.fk_pro
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e on ps.fk_entrepot = e.rowid'; // Link on unique key
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_batch as pb on pb.fk_product_stock = ps.rowid'; // Detail for each lot on each warehouse
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lot as pl on pl.fk_product = p.rowid AND pl.batch = pb.batch'; // Link on unique key
-$sql .= " WHERE p.entity IN (".getEntity('product').")";
+$sql .= " WHERE p.entity IN (".getEntity('product').") AND e.entity IN (".getEntity('stock').")";
if (!empty($search_categ) && $search_categ != '-1') {
$sql .= " AND ";
if ($search_categ == -2) {
@@ -514,6 +514,13 @@ print '';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+ print '
';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index ee2e13e1d57..42f4d326811 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -35,7 +35,7 @@ if ($user->socid) {
}
$result = restrictedArea($user, 'tax', '', '', 'charges');
$ltt = GETPOST("localTaxType", 'int');
-
+$mode = GETPOST('mode', 'alpha');
/*
* View
@@ -49,7 +49,14 @@ $url = DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt
if (!empty($socid)) {
$url .= '&socid='.$socid;
}
-$newcardbutton = dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?localTaxType='.$ltt.'&mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?localTaxType='.$ltt.'&mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'title_accountancy');
@@ -77,19 +84,36 @@ if ($result) {
while ($i < $num) {
$obj = $db->fetch_object($result);
- print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+ if (property_exists($this, 'label')) {
+ $return .= ' | '.$this->label.'';
+ }
+ if (property_exists($this, 'datev')) {
+ $return .= '
'.$langs->trans("DateEnd").' : '.dol_print_date($this->db->jdate($this->datev), 'day').''; + } + if (property_exists($this, 'datep')) { + $return .= '
'.$langs->trans("DatePayment", '', '', '', '', 5).' : '.dol_print_date($this->db->jdate($this->datep), 'day').''; + } + if (property_exists($this, 'amount')) { + $return .= '
'.$langs->trans("Amount").' : '.price($this->amount).''; + } + $return .= '
';
+ $return .= ''.$langs->trans("DateEnd").' : '.dol_print_date($this->db->jdate($this->datev), 'day').''; + } + if (property_exists($this, 'datep')) { + $return .= '
'.$langs->trans("DatePayment", '', '', '', '', 5).' : '.dol_print_date($this->db->jdate($this->datep), 'day').''; + } + if (property_exists($this, 'amount')) { + $return .= '
'.$langs->trans("Amount").' : '.price($this->amount).''; + } + $return .= '
';
+ }
+ // Output Kanban
+ print $localtax_static->getKanbanView('');
+ if ($i == ($num - 1)) {
+ print '
';
+ print '';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 054ef800586..38db4fca14b 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -44,6 +44,7 @@ $result = restrictedArea($user, 'banque', '', '');
$search_ref = GETPOST('search_ref', 'alpha');
$search_account = GETPOST('search_account', 'int');
$search_amount = GETPOST('search_amount', 'alpha');
+$mode = GETPOST('mode', 'alpha');
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -149,6 +150,9 @@ if ($resql) {
$num = $db->num_rows($resql);
$i = 0;
$param = '';
+ if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+ }
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.$contextpage;
}
@@ -160,7 +164,10 @@ if ($resql) {
if (!empty($socid)) {
$url .= '&socid='.$socid;
}
- $newcardbutton = dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->cheque);
+ $newcardbutton = '';
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->cheque);
print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'';
+
+ if (property_exists($this, 'date_bordereau')) {
+ $return .= '
'.$langs->trans("DateCreation").' : '.dol_print_date($this->db->jdate($this->date_bordereau), 'day').''; + } + if (property_exists($this, 'nbcheque')) { + $return .= '
'.$langs->trans("Cheque", '', '', '', '', 5).' : '.$this->nbcheque.''; + } + if (property_exists($this, 'account_id')) { + $return .= ' | '.$this->account_id.''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
';
+ $return .= ''.$langs->trans("DateCreation").' : '.dol_print_date($this->db->jdate($this->date_bordereau), 'day').''; + } + if (property_exists($this, 'nbcheque')) { + $return .= '
'.$langs->trans("Cheque", '', '', '', '', 5).' : '.$this->nbcheque.''; + } + if (property_exists($this, 'account_id')) { + $return .= ' | '.$this->account_id.''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
'.$this->LibStatut($this->statut, 5).'
';
+ }
+ if (property_exists($this, 'amount')) {
+ $return .= ' | '.$langs->trans("Amount").' : '.price($this->amount).'
';
+ }
+ $return .= '';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 4906313cad1..8d9489bbec7 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -43,6 +43,7 @@ $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlinelist'; // To manage different context of search
$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode = GETPOST('mode', 'alpha');
$type = GETPOST('type', 'aZ09');
@@ -188,12 +189,18 @@ if ($result) {
$param = "&statut=".urlencode($statut);
$param .= "&search_bon=".urlencode($search_bon);
+ if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+ }
if ($type == 'bank-transfer') {
$param .= '&type=bank-transfer';
}
if ($limit > 0 && $limit != $conf->liste_limit) {
$param .= '&limit='.urlencode($limit);
}
+ $newcardbutton = '';
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+ $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
print"\n\n";
print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'';
+
+ if (property_exists($this, 'date_echeance')) {
+ $return .= '
'.$langs->trans("Date").' : '.dol_print_date($this->db->jdate($this->date_echeance), 'day').''; + } + if (property_exists($this, 'total')) { + $return .= '
'.$langs->trans("Amount").' : '.price($this->total).''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
';
+ $return .= ''.$langs->trans("Date").' : '.dol_print_date($this->db->jdate($this->date_echeance), 'day').''; + } + if (property_exists($this, 'total')) { + $return .= '
'.$langs->trans("Amount").' : '.price($this->total).''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
'.$this->LibStatut($this->statut, 5).'
';
+ }
+ $return .= '';
+ }
+ // Output Kanban
- print '';
- print $directdebitorder->getNomUrl(1);
- print " \n";
+ print $directdebitorder->getKanbanView('');
+ if ($i == (min($num, $limit) - 1)) {
+ print '
';
+ print '';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 83690816801..a925fe6968d 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -47,6 +47,8 @@ $massaction = GETPOST('massaction', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
+$mode = GETPOST('mode', 'alpha');
+
$search_ref = GETPOST('search_ref', 'int');
$search_label = GETPOST('search_label', 'alpha');
@@ -294,6 +296,9 @@ $num = $db->num_rows($resql);
$i = 0;
$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
@@ -367,6 +372,8 @@ if ($search_date_limit_endyear) {
}
$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
if ($user->rights->tax->charges->creer) {
$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/sociales/card.php?action=create');
}
@@ -382,6 +389,8 @@ print '';
print '';
print '';
print '';
+print '';
+
$center = '';
@@ -576,162 +585,179 @@ while ($i < min($num, $limit)) {
$chargesociale_static->ref = $obj->rowid;
$chargesociale_static->label = $obj->label;
$chargesociale_static->type_label = $obj->type_label;
+ $chargesociale_static->amount = $obj->amount;
+ $chargesociale_static->paye = $obj->paye;
+ $chargesociale_static->date_ech = $obj->date_ech;
+
if (isModEnabled('project')) {
$projectstatic->id = $obj->project_id;
$projectstatic->ref = $obj->project_ref;
$projectstatic->title = $obj->project_label;
}
-
- print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'';
+ if (property_exists($this, 'fk_project') && !empty($this->fk_project)) {
+ $return .= ' | '.$this->fk_project.'';
+ }
+ if (property_exists($this, 'date_ech')) {
+ $return .= '
'.$langs->trans("DateEnd").':'.dol_print_date($this->date_ech).''; + } + if (property_exists($this, 'amount')) { + $return .= '
'.$langs->trans("Amount").' : '.price($this->amount).''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
';
+ $return .= ''.$langs->trans("DateEnd").':'.dol_print_date($this->date_ech).''; + } + if (property_exists($this, 'amount')) { + $return .= '
'.$langs->trans("Amount").' : '.price($this->amount).''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
'.$this->LibStatut($this->paye, 5, $this->alreadypaid).'
';
+ }
+ $return .= '';
}
- }
+ // Output Kanban
- // Ref
- if (!empty($arrayfields['cs.rowid']['checked'])) {
- print ''.$chargesociale_static->getNomUrl(1, '20').' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ $chargesociale_static->fk_project = $projectstatic->getNomUrl();
+ print $chargesociale_static->getKanbanView('');
+ if ($i == (min($num, $limit) - 1)) {
+ print '
';
+ print '';
+ $return .= '
';
+ return $return;
+ }
}
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 001ef1e7b38..c839625a705 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -44,6 +44,7 @@ $massaction = GETPOST('massaction', 'alpha');
$confirm = GETPOST('confirm', 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist';
+$mode = GETPOST('mode', 'alpha');
$search_ref = GETPOST('search_ref', 'alpha');
$search_label = GETPOST('search_label', 'alpha');
@@ -230,6 +231,9 @@ if (!$resql) {
$num = $db->num_rows($resql);
$param = '';
+if (!empty($mode)) {
+ $param .= '&mode='.urlencode($mode);
+}
if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) {
$param .= '&contextpage='.$contextpage;
}
@@ -317,7 +321,10 @@ $url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
if (!empty($socid)) {
$url .= '&socid='.$socid;
}
-$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewVATPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
print_barre_liste($langs->trans("VATDeclarations"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
@@ -461,116 +468,134 @@ while ($i < min($num, $limit)) {
$tva_static->id = $obj->rowid;
$tva_static->ref = $obj->rowid;
$tva_static->label = $obj->label;
+ $tva_static->paiementtype = $obj->paye;
+ $tva_static->type_payment = $obj->payment_code;
+ $tva_static->datev = $obj->datev;
+ $tva_static->amount = $obj->amount;
- print '';
+ $return .= '';
+ $return .= '
';
+ $return .= '';
+ $return .= ''.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(1) : $this->ref).'';
+ if (property_exists($this, 'amount')) {
+ $return .= ' | '.$langs->trans("Amount").' : '.price($this->amount).'';
+ }
+ if (property_exists($this, 'type_payment')) {
+ $return .= '
'.$langs->trans("Payement").' : '.$this->type_payment.''; + } + if (property_exists($this, 'datev')) { + $return .= '
'.$langs->trans("DateEnd").' : '.dol_print_date($this->datev).''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
';
+ $return .= ''.$langs->trans("Payement").' : '.$this->type_payment.''; + } + if (property_exists($this, 'datev')) { + $return .= '
'.$langs->trans("DateEnd").' : '.dol_print_date($this->datev).''; + } + if (method_exists($this, 'LibStatut')) { + $return .= '
'.$this->LibStatut($this->paiementtype, 5, $this->alreadypaid).'
';
+ }
+ $return .= '';
}
- }
+ // Output Kanban
- // Ref
- if (!empty($arrayfields['t.rowid']['checked'])) {
- print '';
- print $tva_static->getNomUrl(1);
- $filename = dol_sanitizeFileName($tva_static->ref);
- $filedir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($tva_static->ref);
- $urlsource = $_SERVER['PHP_SELF'].'?id='.$tva_static->id;
- print $formfile->getDocumentsLink($tva_static->element, $filename, $filedir, '', 'valignmiddle paddingleft2imp');
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
+ print $tva_static->getKanbanView('');
+ if ($i == (min($num, $limit) - 1)) {
+ print '
';
+ print '';
print '
'.$contactstatic->libProspCommStatut($obj->stcomm_id, 2, $contactstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
print '
- ';
@@ -1437,6 +1481,7 @@ while ($i < min($num, $limit)) {
// Extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+
// Fields from hook
$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -1450,6 +1495,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Date modification
if (!empty($arrayfields['p.tms']['checked'])) {
print '';
@@ -1459,6 +1505,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Status
if (!empty($arrayfields['p.statut']['checked'])) {
print ' '.$contactstatic->getLibStatut(5).' ';
@@ -1466,6 +1513,7 @@ while ($i < min($num, $limit)) {
$totalarray['nbfield']++;
}
}
+
// Import key
if (!empty($arrayfields['p.import_key']['checked'])) {
print '';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 79897cdc16d..123366fd630 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -427,6 +427,7 @@ if (empty($reshook)) {
} else {
$idprod = GETPOST('idprod', 'int');
}
+
$tva_tx = GETPOST('tva_tx', 'alpha');
$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
@@ -474,11 +475,11 @@ if (empty($reshook)) {
$prod->fetch($idprod);
// Update if prices fields are defined
- $tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
+ /*$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
if (empty($tva_tx)) {
$tva_npr = 0;
- }
+ }*/
$price_min = $prod->price_min;
$price_min_ttc = $prod->price_min_ttc;
@@ -500,14 +501,14 @@ if (empty($reshook)) {
if (count($prodcustprice->lines) > 0) {
$price_min = price($prodcustprice->lines[0]->price_min);
$price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
- $tva_tx = $prodcustprice->lines[0]->tva_tx;
+ /*$tva_tx = $prodcustprice->lines[0]->tva_tx;
if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
}
$tva_npr = $prodcustprice->lines[0]->recuperableonly;
if (empty($tva_tx)) {
$tva_npr = 0;
- }
+ }*/
}
}
}
@@ -699,7 +700,7 @@ if (empty($reshook)) {
$date_end_real_update = $objectline->date_end_real;
}
- $vat_rate = GETPOST('eltva_tx');
+ $vat_rate = GETPOST('eltva_tx', 'alpha');
// Define info_bits
$info_bits = 0;
if (preg_match('/\*/', $vat_rate)) {
@@ -2046,11 +2047,12 @@ if ($action == 'create') {
$dateSelector = 1;
print "\n";
- print ' ';
- }
- // Email
- if (!empty($arrayfields['s.email']['checked'])) {
- print ''.dol_print_email($obj->email, 0, $obj->socid, 0, 0, 1, 1).' ';
- }
- // Town
- if (!empty($arrayfields['s.town']['checked'])) {
- print '';
- print $obj->town;
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Zip
- if (!empty($arrayfields['s.zip']['checked'])) {
- print '';
- print $obj->zip;
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // State
- if (!empty($arrayfields['state.nom']['checked'])) {
- print "".$obj->state_name." \n";
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Country
- if (!empty($arrayfields['country.code_iso']['checked'])) {
- print '';
- print dol_escape_htmltag($socstatic->country);
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Type ent
- if (!empty($arrayfields['typent.code']['checked'])) {
- print '';
- if (count($typenArray) == 0) {
- $typenArray = $formcompany->typent_array(1);
- }
- print $typenArray[$obj->typent_code];
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- if (!empty($arrayfields['sale_representative']['checked'])) {
- // Sales representatives
- print '';
- if ($obj->socid > 0) {
- $listsalesrepresentatives = $socstatic->getSalesRepresentatives($user);
- if ($listsalesrepresentatives < 0) {
- dol_print_error($db);
- }
- $nbofsalesrepresentative = count($listsalesrepresentatives);
- if ($nbofsalesrepresentative > 6) {
- // We print only number
- print $nbofsalesrepresentative;
- } elseif ($nbofsalesrepresentative > 0) {
- $userstatic = new User($db);
- $j = 0;
- foreach ($listsalesrepresentatives as $val) {
- $userstatic->id = $val['id'];
- $userstatic->lastname = $val['lastname'];
- $userstatic->firstname = $val['firstname'];
- $userstatic->email = $val['email'];
- $userstatic->statut = $val['statut'];
- $userstatic->entity = $val['entity'];
- $userstatic->photo = $val['photo'];
- $userstatic->login = $val['login'];
- $userstatic->phone = $val['phone'];
- $userstatic->job = $val['job'];
- $userstatic->gender = $val['gender'];
-
- //print ' ';
+ // Action column
+ if (getDolGlobalString('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($obj->rowid, $arrayofselected)) {
+ $selected = 1;
}
+ print '';
}
- //else print $langs->trans("NoSalesRepresentativeAffected");
- } else {
- print ' ';
+ print ' ';
}
- print '';
- }
- // Date
- if (!empty($arrayfields['c.date_contrat']['checked'])) {
- print ''.dol_print_date($db->jdate($obj->date_contrat), 'day', 'tzserver').' ';
- }
- // Extra fields
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- // Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
- // Date creation
- if (!empty($arrayfields['c.datec']['checked'])) {
- print '';
- print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Date modification
- if (!empty($arrayfields['c.tms']['checked'])) {
- print '';
- print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Date lower end date
- if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
- print '';
- print dol_print_date($db->jdate($obj->lower_planned_end_date), 'day', 'tzuser');
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- }
- // Status
- if (!empty($arrayfields['status']['checked'])) {
- print ''.($obj->nb_initial > 0 ? $obj->nb_initial : '').' ';
- print ''.($obj->nb_running > 0 ? $obj->nb_running : '').' ';
- print ''.($obj->nb_expired > 0 ? $obj->nb_expired : '').' ';
- print ''.($obj->nb_closed > 0 ? $obj->nb_closed : '').' ';
- }
- // Action column
- if (!getDolGlobalString('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($obj->rowid, $arrayofselected)) {
- $selected = 1;
+ // Ref
+ if (!empty($arrayfields['c.ref']['checked'])) {
+ print ' ';
+ print $contracttmp->getNomUrl(1);
+ if ($obj->nb_late) {
+ print img_warning($langs->trans("Late"));
+ }
+ if (!empty($obj->note_private) || !empty($obj->note_public)) {
+ print ' ';
+ print ''.img_picto($langs->trans("ViewPrivateNote"), 'note').'';
+ print '';
}
- print '';
- }
- print ' ';
- }
- if (!$i) {
- $totalarray['nbfield']++;
- }
- print " \n";
+ $filename = dol_sanitizeFileName($obj->ref);
+ $filedir = $conf->contrat->multidir_output[$obj->entity].'/'.dol_sanitizeFileName($obj->ref);
+ $urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+ print $formfile->getDocumentsLink($contracttmp->element, $filename, $filedir);
+ print '
':
- print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
- $j++;
- if ($j < $nbofsalesrepresentative) {
- print ' ';
- }
- //print '
';
+ } else {
+ print '':
+ print ($nbofsalesrepresentative < 2) ? $userstatic->getNomUrl(-1, '', 0, 0, 12) : $userstatic->getNomUrl(-2);
+ $j++;
+ if ($j < $nbofsalesrepresentative) {
+ print ' ';
+ }
+ //print '
';
+ }
+ }
+ //else print $langs->trans("NoSalesRepresentativeAffected");
+ } else {
+ print ' ';
+ }
+ print '';
+ print $form->selectDate($search_birthday_dtstart ? $search_birthday_dtstart : '', "search_birthday_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print '
';
+ print '';
+ print $form->selectDate($search_birthday_dtend ? $search_birthday_dtend : '', "search_birthday_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print '
';
} else {
print '';
}
@@ -1342,6 +1368,13 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl
print '';
}
+ // Birthday
+ if (!empty($arrayfields['t.birthday']['checked'])) {
+ print ''.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'
';
+ $morehtmlleft .= ''.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, 0, $width, 0, '').'
';
} else {
if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
$nophoto = '';
$morehtmlleft .= '';
} else { // Show no photo link
$nophoto = '/public/theme/common/nophoto.png';
- $morehtmlleft .= '';
}
+ $object->id = $obj->type_id;
+ $bom->id = $obj->fk_bom;
+ $objectBom = $bom->fetch($obj->fk_bom);
+ //var_dump($bom);exit;
+ $object->fk_bom = $bom->getNomUrl();
- if (in_array($val['type'], array('timestamp'))) {
- $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
- } elseif ($key == 'ref') {
- $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ // Output Kanban
+ print $object->getKanbanView('');
+ if ($i == (min($num, $limit) - 1)) {
+ print '
';
+ print '| '; + $searchpicto = $form->showFilterButtons(); + print $searchpicto; + print ' | '; +} print ''; print ''; print ' | '; @@ -571,6 +578,10 @@ $totalarray['nbfield'] = 0; // Fields title label // -------------------------------------------------------------------- print '|||
| '; + } + // Ref print ' | '; print $product_static->getNomUrl(1, '', 16); @@ -711,7 +729,10 @@ while ($i < $imaxinloop) { print ' | '.$product_static->LibStatut($objp->tobuy, 5, 1).' | '; - print ''; + // Action column + if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) { + print ' | '; + } print " |
| '; + // Action column print ' | '; $searchpicto = $form->showFilterButtons(); @@ -1062,6 +1094,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third $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 print $hookmanager->resPrint; + print ' | '; print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch '); print "\n"; @@ -1069,7 +1102,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third if (count($tasksarray) > 0) { // Show all lines in taskarray (recursive function to go down on tree) $j = 0; $level = 0; - $nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields); + $nboftaskshown = projectLinesa($j, 0, $tasksarray, $level, true, 0, $tasksrole, $object->id, 1, $object->id, $filterprogresscalc, ($object->usage_bill_time ? 1 : 0), $arrayfields, $arrayofselected); } else { $colspan = 10; if ($object->usage_bill_time) { diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php index 72c5eb25874..bc4c8770f0f 100644 --- a/htdocs/projet/tasks/list.php +++ b/htdocs/projet/tasks/list.php @@ -580,6 +580,9 @@ llxHeader('', $title, $help_url); $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); } @@ -697,7 +700,11 @@ if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'pr } $massactionbutton = $form->selectMassAction('', $arrayofmassactions); -$newcardbutton = dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $user->rights->projet->creer); +$newcardbutton = ''; + +$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition')); +$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition')); +$newcardbutton .= dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $user->rights->projet->creer); print ' |