Merge branch 'develop' into NegativeBills

ChangeLog

@@ -4,10 +4,13 @@ English Dolibarr ChangeLog
 
 ***** ChangeLog for 10.0.0 compared to 9.0.0 *****
 For Users:
-NEW: Module ticket is available as a stable module
-NEW: Experimental module "Vendor receptions"
+NEW: Module Ticket is available as a stable module.
+NEW: Experimental module "Vendor receptions".
+NEW: Experimental module "BOM".
+FIX: Disallow line start date to be after end date
 
 For Developers:
+NEW: Module DebugBar is available as a stable module.
 
 
 WARNING:
@@ -21,6 +24,7 @@ Following changes may create regressions for some external modules, but were nec
 * All methods set_draft() were renamed into setDraft().
 * Removed deprecated function function test_sql_and_script_inject that was replaced with testSqlAndScriptInject.
 * Method load_measuring_units were renamed into selectMeasuringUnits and select_measuring_units was deprecated.
+* Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 
 
 ***** ChangeLog for 9.0.1 compared to 9.0.0 *****

htdocs/accountancy/admin/account.php

@@ -247,7 +247,7 @@
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	$newcardbutton = '<a class="butActionNew" href="./card.php?action=create"><span class="valignmiddle">' . $langs->trans("Addanaccount").'</span>';
+	$newcardbutton = '<a class="butActionNew" href="./card.php?action=create"><span class="valignmiddle text-plus-circle">' . $langs->trans("Addanaccount").'</span>';
 	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
 	$newcardbutton.= '</a>';
 

htdocs/accountancy/admin/fiscalyear.php

@@ -113,11 +113,11 @@
 
 	if (! empty($user->rights->accounting->fiscalyear))
 	{
-		$addbutton = '<a class="butActionNew" href="fiscalyear_card.php?action=create"><span class="valignmiddle">' . $langs->trans("NewFiscalYear") .'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
+		$addbutton = '<a class="butActionNew" href="fiscalyear_card.php?action=create"><span class="valignmiddle text-plus-circle">' . $langs->trans("NewFiscalYear") .'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}
 	else
 	{
-		$addbutton = '<a class="butActionRefused classfortooltip" href="#"><span class="valignmiddle" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">' . $langs->trans("NewFiscalYear") .'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
+		$addbutton = '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"><span class="valignmiddle text-plus-circle">' . $langs->trans("NewFiscalYear") .'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
 	}
 
 	$title = $langs->trans('AccountingPeriods');

htdocs/accountancy/admin/productaccount.php

@@ -333,7 +333,7 @@
 	if ($accounting_product_mode == 'ACCOUNTANCY_BUY') print '<td class="liste_titre"></td>';
 	// Current account
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" size="6" name="search_current_account" value="' . dol_escape_htmltag($search_current_account) . '">';
+	print '<input type="text" class="flat" size="6" name="search_current_account" id="search_current_account" value="' . dol_escape_htmltag($search_current_account) . '">';
 	$listofvals=array('withoutvalidaccount'=>$langs->trans("WithoutValidAccount"), 'withvalidaccount'=>$langs->trans("WithValidAccount"));
 	print ' '.$langs->trans("or").' '.$form->selectarray('search_current_account_valid', $listofvals, $search_current_account_valid, 1);
 	print '</td>';
@@ -481,6 +481,14 @@ function init_savebutton()
         	});
 
         	init_savebutton();
+
+            jQuery("#search_current_account").keyup(function() {
+        		if (jQuery("#search_current_account").val() != \'\')
+                {
+                    console.log("We set a value of account to search "+jQuery("#search_current_account").val()+", so we disable the other search criteria on account");
+                    jQuery("#search_current_account_valid").val(-1);
+                }
+        	});
         });
         </script>';
 

htdocs/accountancy/bookkeeping/list.php

@@ -451,7 +451,7 @@
 
 
 $groupby = ' <a class="nohover marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param.'">' . $langs->trans("GroupByAccountAccounting") . '</a>';
-$newcardbutton = '<a class="butActionNew" href="./card.php?action=create"><span class="valignmiddle">' . $langs->trans("NewAccountingMvt").'</span>';
+$newcardbutton = '<a class="butActionNew" href="./card.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans("NewAccountingMvt").'</span>';
 $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
 $newcardbutton.= '</a>';
 

htdocs/accountancy/bookkeeping/listbyaccount.php

@@ -257,7 +257,7 @@
 print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 
 $viewflat = ' <a class="nohover marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param.'">' . $langs->trans("ViewFlatList") . '</a>';
-$newcardbutton = '<a class="butActionNew" href="./card.php?action=create"><span class="valignmiddle">' . $langs->trans("NewAccountingMvt").'</span>';
+$newcardbutton = '<a class="butActionNew" href="./card.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans("NewAccountingMvt").'</span>';
 $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
 $newcardbutton.= '</a>';
 

htdocs/adherents/agenda.php

@@ -151,7 +151,7 @@
 	$newcardbutton = '';
     if (! empty($conf->agenda->enabled))
     {
-    	$newcardbutton.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id.'"><span class="valignmiddle">'.$langs->trans("AddAction").'</span>';
+    	$newcardbutton.='<a class="butActionNew" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id.'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddAction").'</span>';
     	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
     	$newcardbutton.= '</a>';
     }

htdocs/adherents/list.php

@@ -365,7 +365,7 @@
 $newcardbutton='';
 if ($user->rights->adherent->creer)
 {
-	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewMember').'</span>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/card.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans('NewMember').'</span>';
 	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
 	$newcardbutton.= '</a>';
 }

htdocs/adherents/subscription/list.php

@@ -247,7 +247,7 @@
 $newcardbutton='';
 if ($user->rights->adherent->cotisation->creer)
 {
-	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/list.php?status=-1,1"><span class="valignmiddle">'.$langs->trans('NewSubscription').'</span>';
+	$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/list.php?status=-1,1"><span class="valignmiddle text-plus-circle">'.$langs->trans('NewSubscription').'</span>';
 	$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
 	$newcardbutton.= '</a>';
 }
@@ -284,7 +284,7 @@
 if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 
 // Line for filters fields

htdocs/adherents/type.php

@@ -232,7 +232,7 @@
 		$newcardbutton='';
 		if ($user->rights->adherent->configurer)
 		{
-			$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/type.php?action=create"><span class="valignmiddle">'.$langs->trans('NewMemberType').'</span>';
+			$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/type.php?action=create"><span class="valignmiddle text-plus-circle">'.$langs->trans('NewMemberType').'</span>';
 			$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
 			$newcardbutton.= '</a>';
 		}

htdocs/admin/debugbar.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2007      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2013	   Juanjo Menent        <jmenent@2byte.es>
@@ -47,8 +47,9 @@
 {
 	$db->begin();
 
-	$result = dolibarr_set_const($db, "DEBUGBAR_LOGS_LINES_NUMBER", GETPOST('DEBUGBAR_LOGS_LINES_NUMBER', 'int'), 'chaine', 0, '', 0);
-	if ($result < 0)
+	$result1 = dolibarr_set_const($db, "DEBUGBAR_LOGS_LINES_NUMBER", GETPOST('DEBUGBAR_LOGS_LINES_NUMBER', 'int'), 'chaine', 0, '', 0);
+	$result2 = dolibarr_set_const($db, "DEBUGBAR_USE_LOG_FILE", GETPOST('DEBUGBAR_USE_LOG_FILE', 'int'), 'chaine', 0, '', 0);
+	if ($result1 < 0 || $result2 < 0)
     {
         $error++;
     }
@@ -61,7 +62,7 @@
 	else
 	{
 		$db->rollback();
-		setEventMessages($error, $errors, 'errors');
+		setEventMessages($error, null, 'errors');
 	}
 }
 
@@ -96,6 +97,12 @@
 print ' '.$langs->trans("WarningValueHigherSlowsDramaticalyOutput");
 print '</td></tr>';
 
+print '<tr class="oddeven"><td>'.$langs->trans("DEBUGBAR_USE_LOG_FILE").'</td>';
+print '<td colspan="2">';
+print $form->selectyesno('DEBUGBAR_USE_LOG_FILE', $conf->global->DEBUGBAR_USE_LOG_FILE, 1);
+print ' '.$langs->trans("UsingLogFileShowAllRecordOfSubrequestButIsSlower");
+print '</td></tr>';
+
 print '</table>';
 print "</form>\n";
 

htdocs/admin/defaultvalues.php

@@ -207,7 +207,7 @@
 
 print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
 
-print $langs->trans("DefaultValuesDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("DefaultValuesDesc")."</span><br>\n";
 print "<br>\n";
 
 if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;

htdocs/admin/emailcollector_card.php

@@ -178,10 +178,9 @@
 	dol_include_once('/emailcollector/class/emailcollector.class.php');
 
 	$res = $object->doCollectOneCollector();
-
 	if ($res > 0)
 	{
-		setEventMessages($object->output, null, 'mesgs');
+	    setEventMessages($object->lastresult, null, 'mesgs');
 	}
 	else
 	{
@@ -391,7 +390,7 @@ function init_myfunc()
 		$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
 		$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
 
-		$connection = imap_open($connectstringsource, $object->user, $object->password);
+		$connection = imap_open($connectstringsource, $object->login, $object->password);
 	}
 	else
 	{
@@ -443,8 +442,21 @@ function init_myfunc()
 	// Add filter
 	print '<tr class="oddeven">';
 	print '<td>';
-	$arrayoftypes=array('from'=>'MailFrom', 'to'=>'MailTo', 'cc'=>'Cc', 'bcc'=>'Bcc', 'subject'=>'Subject', 'body'=>'Body', 'seen'=>'AlreadyRead', 'unseen'=>'NotRead', 'withtrackingid'=>'WithDolTrackingID', 'withouttrackingid'=>'WithoutDolTrackingID');
-	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1);
+	$arrayoftypes=array(
+	    'from'=>'MailFrom',
+	    'to'=>'MailTo',
+	    'cc'=>'Cc',
+	    'bcc'=>'Bcc',
+	    'subject'=>'Subject',
+	    'body'=>'Body',
+	    'X1'=>'---',
+	    'seen'=>'AlreadyRead',
+	    'unseen'=>'NotRead',
+	    'X2'=>'---',
+	    'withtrackingid'=>'WithDolTrackingID',
+	    'withouttrackingid'=>'WithoutDolTrackingID'
+	);
+	print $form->selectarray('filtertype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', '', 0, '', 2);
 	print '</td><td>';
 	print '<input type="text" name="rulevalue">';
 	print '</td>';
@@ -462,7 +474,6 @@ function init_myfunc()
 		print '</td>';
 		print '<td>'.$rulefilter['rulevalue'].'</td>';
 		print '<td class="right">';
-		//print $rulefilterobj->getLibStatut(3);
 		print ' <a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletefilter&filterid='.$rulefilter['id'].'">'.img_delete().'</a>';
 		print '</td>';
 		print '</tr>';

htdocs/admin/emailcollector_list.php

@@ -321,7 +321,7 @@ function init_myfunc()
 $newcardbutton='';
 //if ($user->rights->emailcollector->creer)
 //{
-$newcardbutton='<a class="butActionNew" href="emailcollector_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle">'.$langs->trans('New').'</span>';
+$newcardbutton='<a class="butActionNew" href="emailcollector_card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle text-plus-circle">'.$langs->trans('New').'</span>';
 $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
 $newcardbutton.= '</a>';
 //}

htdocs/admin/export.php

@@ -51,48 +51,52 @@
  * View
  */
 
+$form=new Form($db);
+
 $page_name = "ExportSetup";
 llxHeader('', $langs->trans($page_name));
 
 // Subheader
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-    . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
+
 print load_fiche_titre($langs->trans($page_name), $linkback);
 
-// Configuration header
+//$head = export_admin_prepare_head();
+$h=0;
+$head = array();
+$head[$h][0] = DOL_URL_ROOT.'/admin/export.php';
+$head[$h][1] = $langs->trans("Setup");
+$head[$h][2] = 'setup';
+$h++;
 
-dol_fiche_head(
-    $head,
-    'settings',
-    $langs->trans("ExportsArea"),
-    0,
-    "exports"
-);
+dol_fiche_head($head, 'setup', $langs->trans("ExportsArea"), -1, "exports");
 
-// Setup page goes here
-$form=new Form($db);
 
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("ExportModel").'</td>'."\n";
+print '<td>'.$langs->trans("Parameters").'</td>'."\n";
 print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100"></td>'."\n";
 
 
 // Example with a yes / no select
 print '<tr class="oddeven">';
-print '<td>'.$langs->trans("set_EXPORTS_SHARE_MODELS").'</td>';
+print '<td>'.$langs->trans("EXPORTS_SHARE_MODELS").'</td>';
 print '<td class="center" width="20">&nbsp;</td>';
 print '<td class="center" width="100">';
+
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="action" value="set_EXPORTS_SHARE_MODELS">';
 echo ajax_constantonoff('EXPORTS_SHARE_MODELS');
 print '</form>';
+
 print '</td></tr>';
 
 print '</table>';
 
+dol_fiche_end();
+
 // End of page
 llxFooter();
 $db->close();

htdocs/admin/ihm.php

@@ -217,7 +217,7 @@
 
 print load_fiche_titre($langs->trans("GUISetup"), '', 'title_setup');
 
-print $langs->trans("DisplayDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("DisplayDesc")."</span><br>\n";
 print "<br>\n";
 
 

htdocs/admin/index.php

@@ -37,11 +37,11 @@
  * View
  */
 
+$form = new Form($db);
+
 $wikihelp='EN:First_setup|FR:Premiers_paramétrages|ES:Primeras_configuraciones';
 llxHeader('', $langs->trans("Setup"), $wikihelp);
 
-$form = new Form($db);
-
 
 print load_fiche_titre($langs->trans("SetupArea"), '', 'title_setup.png');
 
@@ -68,7 +68,7 @@
     }
 }
 
-print $langs->trans("SetupDescription1").' ';
+print $langs->trans("SetupDescription1");
 print $langs->trans("AreaForAdminOnly").' ';
 print $langs->trans("SetupDescription2", $langs->transnoentities("MenuCompanySetup"), $langs->transnoentities("Modules"))."<br><br>";
 
@@ -115,7 +115,7 @@
 if (empty($reshook))
 {
 	// Show into other
-	print $langs->trans("SetupDescription5")."<br>";
+    print '<span class="opacitymedium">'.$langs->trans("SetupDescription5")."</span><br>";
 	print "<br>";
 
 	// Show logo

htdocs/admin/menus/index.php

@@ -256,7 +256,7 @@
 $newcardbutton='';
 if ($user->admin)
 {
-    $newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/admin/menus/edit.php?menuId=0&action=create&menu_handler='.urlencode($menu_handler).'&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle">'.$langs->trans('New').'</span>';
+    $newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/admin/menus/edit.php?menuId=0&action=create&menu_handler='.urlencode($menu_handler).'&backtopage='.urlencode($_SERVER['PHP_SELF']).'"><span class="valignmiddle text-plus-circle">'.$langs->trans('New').'</span>';
     $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
     $newcardbutton.= '</a>';
 }

htdocs/admin/pdf.php

@@ -115,7 +115,7 @@
 
 print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
 
-print $langs->trans("PDFDesc")."<br>\n";
+print '<span class="opacitymedium">'.$langs->trans("PDFDesc")."</span><br>\n";
 print "<br>\n";
 
 $noCountryCode = (empty($mysoc->country_code) ? true : false);

htdocs/admin/translation.php

@@ -224,14 +224,12 @@
 
 print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
 
-//print '<span class="opacitymedium">';
-print $langs->trans("TranslationDesc")."<br>\n";
-//print '</span>';
-print "<br>\n";
+//print '<span class="opacitymedium">'.$langs->trans("TranslationDesc")."</span><br>\n";
+//print "<br>\n";
 
 $current_language_code=$langs->defaultlang;
 $s=picto_from_langcode($current_language_code);
-print $langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong><br>';
+print $form->textwithpicto($langs->trans("CurrentUserLanguage").': <strong>'.$s.' '.$current_language_code.'</strong>', $langs->trans("TranslationDesc")).'<br>';
 
 print '<br>';