Merge branch 'develop' into develop_update_tablednd

ChangeLog

@@ -15,15 +15,17 @@ WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * The methode "cloture" on contract were renamed into "closeAll".
-* The substitution key for reference of object is now __REF__ whatever is the object (it replaces __ORDERREF__, 
+* The substitution key for reference of objects is now __REF__ whatever is the object (it replaces __ORDERREF__, 
   __PROPALREF__, ...)
 * The substition key __SIGNATURE__ was renamed into __USER_SIGNATURE__ to follow naming conventions. 
 * Substitution keys with syntax %XXX% were renamed into __XXX__ to match others.
+* Removed old deprecated REST API (APIs found into '/root' section of the REST API explorer in Dolibarr v6).
 * Some REST API to access setup features, like dictionaries (country, town, extrafields, ...) were moved into a 
   common API "/setup".
 * The REST API /documents were renamed into /documents/download and /documents/upload. 
-* Page bank/index.php and bank/bankentries.php were renamed into bank/list.php and bank/bankentries_list.php to
-  follow page naming conventions (so default filter/sort order features can also work).
+* Page bank/index.php, bank/bankentries.php and comm/actions/listactions.php were renamed into 
+  bank/list.php, bank/bankentries_list.php and comm/actions/list.php to follow page naming
+  conventions (so default filter/sort order features can also work for this pages).
 * The trigger ORDER_SUPPLIER_STATUS_ONPROCESS was renamed into ORDER_SUPPLIER_STATUS_ORDERED.
 * The trigger ORDER_SUPPLIER_STATUS_RECEIVED_ALL was renamed into ORDER_SUPPLIER_STATUS_RECEIVED_COMPLETELY.
 * The parameter note into method cloture() is added at end of private note (previously in v6, it replaced).
@@ -31,6 +33,8 @@ Following changes may create regressions for some external modules, but were nec
 * Removed js library 'fileupload' that was not used by core code.
 * Jquery plugin tableDnd updated. You now need to use decodeURI on the return value of tableDnDSerialize() 
   and add 'td.' to the beginning of the dragHandle match string. 
+* IE8 and earlier and Firefox 12 and earlier (< 2012) are no more supported. 
+
 
 ***** ChangeLog for 6.0.3 compared to 6.0.2 *****
 FIX: #7211 Update qty dispatched on qty change

build/exe/doliwamp/Languages/MyEnglish.isl

@@ -43,3 +43,5 @@ DoliWampWillStartApacheMysql=DoliWamp installer will now start or restart Apache
 OldVersionFoundAndMoveInNew=An old database version has been found and moved to be used by new Dolibarr version
 OldVersionFoundButFailedToMoveInNew=An old database version has been found but could not be moved to be used with new Dolibarr version
 
+DLLMissing=The "Visual C++ Redistributable for Visual Studio 2012" component is missing. Please install the 32-bit version (vcredit_x86.exe) first from https://www.microsoft.com/en-us/download/details.aspx?id=30679 and restart DoliWamp installation/upgrade.
+ContinueAnyway=Continue anyway (install process may fails without this prerequisite)

build/exe/doliwamp/doliwamp.iss

@@ -202,10 +202,30 @@ var value: String;
 function InitializeSetup(): Boolean;
 begin
   Result := MsgBox(CustomMessage('YouWillInstallDoliWamp')+#13#13+CustomMessage('ThisAssistantInstallOrUpgrade')+#13#13+CustomMessage('IfYouHaveTechnicalKnowledge')+#13#13+CustomMessage('ButIfYouLook')+#13#13+CustomMessage('DoYouWantToStart'), mbConfirmation, MB_YESNO) = IDYES;
+
+  if Result then
+  begin
+  
+	//----------------------------------------------
+	// Test if msvcr110 DLL has been installed
+	//----------------------------------------------
+	
+	if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
+	begin
+	    // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept 
+	    Result := MsgBox(CustomMessage('DLLMissing')+#13#13+CustomMessage('ContinueAnyway'), mbConfirmation, MB_YESNO) = IDYES;
+	    
+	end;
+	// Pb seems similar with msvcp110.dll
+	//vcredist_x64.exe
+	  
+  end;
+
 end;
 
 procedure InitializeWizard();
 begin
+
   //version des applis, a modifier pour chaque version de WampServer 2
   apacheVersion := '2.4.9';
   phpVersion := '5.5.12' ;
@@ -217,6 +237,7 @@ begin
   mysqlPort := '3306';
   newPassword := 'changeme';
 
+
   firstinstall := true;
 
 
@@ -344,18 +365,6 @@ begin
     exedirold := pathWithSlashes+'/bin/mysql/mysql5.0.45';
     exedirnew := pathWithSlashes+'/bin/mysql/mysql5.0.45';
 
-
-    //----------------------------------------------
-    // Test if msvcr110 DLL has been installed
-    //----------------------------------------------
-	
-    if not FileExists ('c:/windows/system32/msvcr110.dll') and not FileExists ('c:/windows/sysWOW64/msvcr110.dll') and not FileExists ('c:/winnt/system32/msvcr110.dll') and not FileExists ('c:/winnt/sysWOW64/msvcr110.dll') then
-    begin
-      // TODO - offer to install the component by opening the URL in the default browser, abort installation if user doesn't accept 
-      MsgBox('The "Visual C++ Redistributable for Visual Studio 2012" component is missing. Please install the 32-bit version (vcredit_x86.exe) first from http://www.microsoft.com/en-us/download/details.aspx?id=30679 and restart DoliWamp installation/upgrade.',mbInformation,MB_OK);
-    end;
-	// Pb seems similar with msvcp110.dll
-	//vcredist_x64.exe
 	
 	
     // If we have a new database version, we should only copy old my.ini file into new directory

build/exe/doliwamp/index.php.install

@@ -535,7 +535,7 @@ a:hover {
 		<li><a href="?lang={$langues[$langue]['autreLangueLien1']}">{$langues[$langue]['autreLangue1']}</a>
 		- <a href="?lang={$langues[$langue]['autreLangueLien2']}">{$langues[$langue]['autreLangue2']}</a></li>
 		<br><br>
-		<li>Provided by <a href="http://www.nltechno.com" targer="_blank">NLTechno</a></li>
+		<li>Provided by <a href="https://www.nltechno.com" targer="_blank">NLTechno</a></li>
 	</ul>
 </td></tr></table>
 <hr>
@@ -580,7 +580,7 @@ a:hover {
 
 
 	<ul id="foot">
-		<li><a href="http://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
+		<li><a href="https://www.nltechno.com/pages/dolibarrwinbin.php">DoliWamp project</a> was built from modified sources of <a href="http://www.wampserver.com">WampServer project</a> from Anaska</li>
 	</ul>
 </body>
 </html>

dev/dolibarr_changes.txt

@@ -105,7 +105,7 @@ JQUERYFILETREE:
 RESTLER:
 --------
 
-* Add 2 lines into function     
+* Add 2 lines into file AutoLoader.php to complete function     
 	private function alias($className, $currentClass)
     {
 		...
@@ -116,4 +116,15 @@ to get
         if ($className == 'Luracast\Restler\string') return;
         if ($className == 'Luracast\Restler\mixed') return;
 		...
-        
+
+Change also file Luracast/Restler/explorer/index.html
+
++With swagger 2:
+
+* Add line into Util.php to complete function
+
+    public static function getShortName($className)
+    {
+    	// @CHANGE LDR
+    	if (! is_string($className)) return;
+    	//var_dump($className);

dev/examples/ldap/ldapsearch_sample1.txt

@@ -7,3 +7,7 @@
 # ldapsearch -h hostname -x -b "ou=people,dc=teclib,dc=infra"
 # ldapsearch -h hostname -x -z 0 -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
 # ldapsearch -h hostname -x -b "o=somecompany.com" -D "cn=manager,o=somecompany.com" -w password "(objectclass=*)"
+#
+# Example to test a ldap search: 
+# ldapsearch -h hostname -x -z 5 -b 'OU=Collaborateurs,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -D 'CN=UserAdmin,OU=Informatique,OU=Utilisateurs,OU=MyCompany,DC=bocal,DC=lan' -w password
+

htdocs/accountancy/admin/export.php

@@ -77,11 +77,6 @@ $model_option = array (
         'label' => 'ACCOUNTING_EXPORT_DATE',
         'param' => '',
     ),
-    //'ACCOUNTING_EXPORT_PIECE',
-    //'ACCOUNTING_EXPORT_GLOBAL_ACCOUNT',
-    //'ACCOUNTING_EXPORT_LABEL',
-    //'ACCOUNTING_EXPORT_AMOUNT',
-    //'ACCOUNTING_EXPORT_DEVISE',
 );
 
 /*
@@ -143,7 +138,6 @@ $form = new Form($db);
 // $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">' . $langs->trans("BackToModuleList") . '</a>';
 print load_fiche_titre($langs->trans('ConfigAccountingExpert'), $linkback, 'title_setup');
 
-$head = admin_accounting_prepare_head();
 
 print "\n".'<script type="text/javascript" language="javascript">'."\n";
 print 'jQuery(document).ready(function () {'."\n";
@@ -193,7 +187,6 @@ print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">';
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="action" value="update">';
 
-dol_fiche_head($head, 'export', $langs->trans("Configuration"), -1, 'technic');
 
 /*
  * Main Options

htdocs/accountancy/bookkeeping/card.php

@@ -648,7 +648,7 @@ if ($action == 'create')
 					print "</tr>\n";
 				}
 
-				if ($total_debit != $total_credit)
+				if (price2num($total_debit) != price2num($total_credit))
 				{
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings');
 				}

htdocs/accountancy/class/accountancyexport.class.php

@@ -547,9 +547,9 @@ class AccountancyExport
             $tab = array();
             // export configurable
             $date = dol_print_date($line->doc_date, $conf->global->ACCOUNTING_EXPORT_DATE);
+            $tab[] = $line->piece_num;
             $tab[] = $date;
             $tab[] = $line->doc_ref;
-            $tab[] = $line->piece_num;
             $tab[] = $line->label_operation;
             $tab[] =  length_accountg($line->numero_compte);
             $tab[] =  length_accounta($line->subledger_account);

htdocs/accountancy/class/accountingjournal.class.php

@@ -30,6 +30,7 @@ class AccountingJournal extends CommonObject
 	public $table_element='accounting_journal';
 	public $fk_element = '';
 	public $ismultientitymanaged = 0;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $picto = 'generic';
 
 	var $rowid;
 
@@ -187,9 +188,6 @@ class AccountingJournal extends CommonObject
 
 		$url = DOL_URL_ROOT . '/accountancy/admin/journals_list.php?id=35';
 
-		$picto = 'billr';
-		$label='';
-
 		$label = '<u>' . $langs->trans("ShowAccountingJournal") . '</u>';
 		if (! empty($this->code))
 			$label .= '<br><b>'.$langs->trans('Code') . ':</b> ' . $this->code;
@@ -223,9 +221,11 @@ class AccountingJournal extends CommonObject
 		$label_link = $this->code;
 		if ($withlabel) $label_link .= ' - ' . $this->label;
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
-		if ($withpicto != 2) $result.=$linkstart . $label_link . $linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $label_link;
+		$result .= $linkend;
+
 		return $result;
 	}
 

htdocs/accountancy/customer/list.php

@@ -302,8 +302,8 @@ if ($result) {
 	    //'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	//if ($massaction == 'presend') $arrayofmassactions=array();
+	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
@@ -319,6 +319,12 @@ if ($result) {
 
 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';
 
+	/*$topicmail="Information";
+	 $modelmail="project";
+	 $objecttmp=new Project($db);
+	 $trackid='prj'.$object->id;
+	 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
+
 	if ($msg) print $msg.'<br>';
 
 	$moreforfilter = '';

htdocs/accountancy/expensereport/list.php

@@ -266,8 +266,8 @@ if ($result) {
 	    //'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	//if ($massaction == 'presend') $arrayofmassactions=array();
+	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
 
 
@@ -284,6 +284,12 @@ if ($result) {
 
 	print $langs->trans("DescVentilTodoExpenseReport") . '</br><br>';
 
+	/*$topicmail="Information";
+	$modelmail="project";
+	$objecttmp=new Project($db);
+	$trackid='prj'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
+
 	if ($msg) print $msg.'<br>';
 
 	$moreforfilter = '';

htdocs/accountancy/supplier/list.php

@@ -298,8 +298,8 @@ if ($result) {
 	    //'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	//if ($massaction == 'presend') $arrayofmassactions=array();
+	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('ventil', $arrayofmassactions, 1);
 
 	print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
@@ -315,6 +315,12 @@ if ($result) {
 
 	print $langs->trans("DescVentilTodoCustomer") . '</br><br>';
 
+	/*$topicmail="Information";
+	 $modelmail="project";
+	 $objecttmp=new Project($db);
+	 $trackid='prj'.$object->id;
+	 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';*/
+
 	if ($msg) print $msg.'<br>';
 
 	$moreforfilter = '';

htdocs/adherents/agenda.php

@@ -168,7 +168,7 @@ if ($object->id > 0)
     	$filters=array();
     	$filters['search_agenda_label']=$search_agenda_label;
 
-    	// TODO Replace this with same code than into listactions.php
+    	// TODO Replace this with same code than into list.php
     	show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
     }
 }

htdocs/adherents/class/adherent.class.php

@@ -1969,7 +1969,7 @@ class Adherent extends CommonObject
 		$this->fullname=$this->getFullName($langs);
 
 		// For avoid ldap error when firstname and lastname are empty
-		if ($this->morphy == 'mor' && empty($this->fullname)) {
+		if ($this->morphy == 'mor' && (empty($this->fullname) || $this->fullname == $this->societe)) {
 			$this->fullname = $this->societe;
 			$this->lastname = $this->societe;
 		}

htdocs/adherents/class/adherent_type.class.php

@@ -388,23 +388,24 @@ class AdherentType extends CommonObject
      *
      *		@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
      *		@param		int		$maxlen			length max label
+     *  	@param		int  	$notooltip		1=Disable tooltip
      *		@return		string					String with URL
      */
-    function getNomUrl($withpicto=0,$maxlen=0)
+    function getNomUrl($withpicto=0, $maxlen=0, $notooltip=0)
     {
         global $langs;
 
         $result='';
         $label=$langs->trans("ShowTypeCard",$this->label);
 
-        $link = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend='</a>';
 
-        $picto='group';
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= ($maxlen?dol_trunc($this->label,$maxlen):$this->label);
+        $result .= $linkend;
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$link.($maxlen?dol_trunc($this->label,$maxlen):$this->label).$linkend;
         return $result;
     }
 

htdocs/adherents/class/subscription.class.php

@@ -22,6 +22,8 @@
  *		\brief		File of class to manage subscriptions of foundation members
  */
 
+//namespace DolibarrMember;
+
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
@@ -265,14 +267,16 @@ class Subscription extends CommonObject
 		$result='';
         $label=$langs->trans("ShowSubscription").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $linkstart = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/card.php?rowid='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		$picto='payment';
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$link.$this->ref.$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 

htdocs/adherents/list.php

@@ -249,12 +249,12 @@ foreach ($search_array_options as $key => $val)
 	$crit=$val;
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
-	$mode=0;
-	if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 	{
-		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
 // Add where from hooks
@@ -355,9 +355,8 @@ $arrayofmassactions =  array(
 //    'presend'=>$langs->trans("SendByMail"),
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
-//if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->adherent->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -372,6 +371,12 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
 
+$topicmail="Information";
+$modelmail="member";
+$objecttmp=new Adherent($db);
+$trackid='mem'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
 if ($sall)
 {
 	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);

htdocs/adherents/subscription.php

@@ -834,13 +834,15 @@ if ($rowid > 0)
             print "</tr>\n";
 
             $accountstatic=new Account($db);
-		
+
             while ($i < $num)
             {
                 $objp = $db->fetch_object($result);
-                print '<tr class="oddeven">';
+
                 $subscriptionstatic->ref=$objp->crowid;
                 $subscriptionstatic->id=$objp->crowid;
+
+                print '<tr class="oddeven">';
                 print '<td>'.$subscriptionstatic->getNomUrl(1).'</td>';
                 print '<td align="center">'.dol_print_date($db->jdate($objp->datec),'dayhour')."</td>\n";
                 print '<td align="center">'.dol_print_date($db->jdate($objp->dateh),'day')."</td>\n";
@@ -885,18 +887,21 @@ if ($rowid > 0)
     }
 
 
-    // Shon online payment link
-    $useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
-
-    if ($useonlinepayment)
+    if (($action != 'addsubscription' && $action != 'create_thirdparty'))
     {
-    	print '<br>';
+	    // Shon online payment link
+	    $useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
 
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-    	print showOnlinePaymentUrl('membersubscription', $object->ref);
+	    if ($useonlinepayment)
+	    {
+	    	print '<br>';
+
+	    	require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+	    	print showOnlinePaymentUrl('membersubscription', $object->ref);
+	    	print '<br>';
+	    }
     }
 
-
     /*
      * Add new subscription form
      */

htdocs/adherents/subscription/list.php

@@ -177,9 +177,8 @@ if ($result)
 	    //'presend'=>$langs->trans("SendByMail"),
 	    //'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	//if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-	if ($user->rights->adherent->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+	if ($user->rights->adherent->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+	if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
     print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -194,6 +193,12 @@ if ($result)
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
 
+	$topicmail="Information";
+	$modelmail="subscription";
+	$objecttmp=new Subscription($db);
+	$trackid='sub'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
 	if ($sall)
 	{
 		print $langs->trans("Filter")." (".$langs->trans("Ref").", ".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;

htdocs/adherents/type.php

@@ -204,10 +204,10 @@ if ($action == 'confirm_delete' && $user->rights->adherent->configurer)
  * View
  */
 
-llxHeader('',$langs->trans("MembersTypeSetup"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
-
 $form=new Form($db);
 
+llxHeader('',$langs->trans("MembersTypeSetup"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
+
 
 // List of members type
 if (! $rowid && $action != 'create' && $action != 'edit')
@@ -252,11 +252,21 @@ if (! $rowid && $action != 'create' && $action != 'edit')
 		print '<th>&nbsp;</th>';
 		print "</tr>\n";
 
+		$membertype = new AdherentType($db);
+
 		while ($i < $num)
 		{
 			$objp = $db->fetch_object($result);
+
+			$membertype->id = $objp->rowid;
+			$membertype->ref = $objp->rowid;
+			$membertype->label = $objp->rowid;
+
 			print '<tr class="oddeven">';
-			print '<td><a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a></td>';
+			print '<td>';
+			print $membertype->getNomUrl(1);
+			//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
+			print '</td>';
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 			print '<td align="center">'.yn($objp->subscription).'</td>';
 			print '<td align="center">'.yn($objp->vote).'</td>';
@@ -440,11 +450,11 @@ if ($rowid > 0)
 		}
 		if ($status != '')
 		{
-		    $sql.= " AND d.statut IN (".$db->escape($status).")";     // Peut valoir un nombre ou liste de nombre separes par virgules
+		    $sql.= natural_search('d.statut', $status, 2);
 		}
 		if ($action == 'search')
 		{
-			if (GETPOST('search'))
+			if (GETPOST('search','alpha'))
 			{
 		  		$sql.= natural_search(array("d.firstname","d.lastname"), GETPOST('search','alpha'));
 		  	}

htdocs/admin/agenda.php

@@ -158,9 +158,10 @@ $head=agenda_prepare_head();
 dol_fiche_head($head, 'autoactions', $langs->trans("Agenda"), -1, 'action');
 
 print $langs->trans("AgendaAutoActionDesc")."<br>\n";
-print $langs->trans("OnlyActiveElementsAreShown").'<br>';
+print $langs->trans("OnlyActiveElementsAreShown", 'modules.php').'<br>';
 print "<br>\n";
 
+print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td class="liste_titre"><input type="text" name="search_event" value="'.dol_escape_htmltag($search_event).'"></td>';
@@ -172,9 +173,9 @@ print $searchpicto;
 print '</td>';
 print '</tr>';
 print '</tr>'."\n";
+
 print '<tr class="liste_titre">';
-print '<th class="liste_titre">'.$langs->trans("ActionsEvents").'</th>';
-print '<th class="liste_titre"></th>';
+print '<th class="liste_titre" colspan="2">'.$langs->trans("ActionsEvents").'</th>';
 print '<th class="liste_titre"><a href="'.$_SERVER["PHP_SELF"].'?action=selectall'.($param?$param:'').'">'.$langs->trans("All").'</a>/<a href="'.$_SERVER["PHP_SELF"].'?action=selectnone'.($param?$param:'').'">'.$langs->trans("None").'</a></th>';
 print '</tr>'."\n";
 // Show each trigger (list is in c_action_trigger)
@@ -211,6 +212,7 @@ if (! empty($triggers))
 	}
 }
 print '</table>';
+print '</div>';
 
 dol_fiche_end();
 

htdocs/admin/defaultvalues.php

@@ -276,7 +276,7 @@ if ($mode != 'focus')
         {
             $texthelp.=$key.' -> '.$val.'<br>';
         }
-        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, '');    // No tooltip on click, this also triggers the sort click
+        $textvalue=$form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
     }
     else
     {

htdocs/admin/dict.php

@@ -80,6 +80,10 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $search_country_id = GETPOST('search_country_id','int');
+if ($search_country_id == '' && ($id == 2 || $id == 3 || $id == 10))	// Not a so good idea to force on current country for all dictionaries. Some tables have entries that are for all countries, we must be able to see them, so this is done for dedicated dictionaries only.
+{
+	$search_country_id = $mysoc->country_id;
+}
 $search_code = GETPOST('search_code','alpha');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -89,7 +93,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,17,35,36,24,28,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,0,);
+$taborder=array(9,0,4,3,2,0,1,8,19,16,27,0,5,11,0,33,34,0,6,0,29,0,7,24,28,17,35,36,0,10,23,12,13,0,14,0,22,20,18,21,0,15,30,0,26,0,);
 
 // Name of SQL tables of dictionaries
 $tabname=array();
@@ -281,6 +285,8 @@ $tabfield[29]= "code,label,percent,position";
 $tabfield[30]= "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 //$tabfield[31]= "pcg_version,label";
 //$tabfield[32]= "code,label,range_account,sens,category_type,formula,position,country_id,country";
+$tabfield[33]= "code,label";
+$tabfield[34]= "code,label";
 $tabfield[35]= "label";
 $tabfield[36]= "range_ik,fk_c_exp_tax_cat";
 
@@ -1009,6 +1015,11 @@ if ($id)
     $sql.=$db->plimit($listlimit+1,$offset);
     //print $sql;
 
+    if (empty($tabfield[$id]))
+    {
+    	dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
+    	exit;
+    }
     $fieldlist=explode(',',$tabfield[$id]);
 
     print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
@@ -1392,6 +1403,7 @@ if ($id)
 
                         foreach ($fieldlist as $field => $value)
                         {
+                        	//var_dump($fieldlist);
                         	$showfield=1;
                         	$align="left";
                         	$valuetoshow=$obj->{$fieldlist[$field]};
@@ -1749,7 +1761,7 @@ $db->close();
  * 	@param		Object		$obj			If we show a particular record, obj is filled with record fields
  *  @param		string		$tabname		Name of SQL table
  *  @param		string		$context		'add'=Output field for the "add form", 'edit'=Output field for the "edit form", 'hide'=Output field for the "add form" but we dont want it to be rendered
- *	@return		string						'' or value of entity into table	
+ *	@return		string						'' or value of entity into table
  */
 function fieldList($fieldlist, $obj='', $tabname='', $context='')
 {

htdocs/admin/mails_senderprofile_list.php

@@ -221,8 +221,8 @@ foreach ($search_array_options as $key => $val)
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
 	$mode_search=0;
-	if (in_array($typ, array('int','double','real'))) $mode_search=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode_search=2;    		// Search on a foreign key int
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
 	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
 	{
 		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
@@ -317,8 +317,8 @@ $arrayofmassactions =  array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->monmodule->delete) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
+if ($user->rights->monmodule->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -333,6 +333,12 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 //print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 
+$topicmail="Information";
+//$modelmail="subscription";
+$objecttmp=new EmailSenderProfile($db);
+//$trackid='sub'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
 $moreforfilter = '';
 /*$moreforfilter.='<div class="divsearchfield">';
 $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';

htdocs/admin/mails_templates.php

@@ -708,7 +708,7 @@ if ($resql)
         {
             if (! empty($tabhelp[$id][$value]))
             {
-                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);   // Tooltip on hover
+                if (in_array($value, array('topic'))) $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value);   // Tooltip on hover
                 else $valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2);                             // Tooltip on hover
             }
             print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable?$fieldlist[$field]:''), ($page?'page='.$page.'&':''), $param, "align=".$align, $sortfield, $sortorder);

htdocs/admin/system/dolibarr.php

@@ -258,7 +258,7 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven"><td>&nbsp; => '.$langs->trans("ClientHour").'</td><td>'.dol_print_date(dol_now(),'dayhour','tzuser').'</td></tr>'."\n";
 
 $filesystemencoding=ini_get("unicode.filesystem_encoding");	// Disponible avec PHP 6.0
-print '<tr class="oddeven"><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";	// date.timezone must be in valued defined in http://fr3.php.net/manual/en/timezones.europe.php
+print '<tr class="oddeven"><td>'.$langs->trans("File encoding").' (php.ini unicode.filesystem_encoding)</td><td>'.$filesystemencoding.'</td></tr>'."\n";
 
 $tmp=ini_get("unicode.filesystem_encoding");						// Disponible avec PHP 6.0
 if (empty($tmp) && ! empty($_SERVER["WINDIR"])) $tmp='iso-8859-1';	// By default for windows

htdocs/admin/workflow.php

@@ -27,8 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$langs->load("admin");
-$langs->load("workflow");
+$langs->loadLangs(array("admin","workflow","propal","workflow","orders","supplier_proposals"));
 
 if (! $user->admin) accessforbidden();
 
@@ -68,21 +67,26 @@ print "<br>";
 
 // List of workflow we can enable
 
-print '<table class="noborder" width="100%">'."\n";
-
 clearstatcache();
 
 $workflowcodes=array(
     // Automatic creation
     'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('family'=>'create', 'position'=>10, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
 	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('family'=>'create', 'position'=>20, 'enabled'=>'! empty($conf->commande->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'bill'),
-    // Automatic classification
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify', 'position'=>30, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order','warning'=>''),
-	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify', 'position'=>30, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'order','warning'=>''),
+    'separator1'=>array('family'=>'separator', 'position'=>25),
+	// Automatic classification proposal
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify_proposal', 'position'=>30, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'propal','warning'=>''),
+	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL'=>array('family'=>'classify_proposal', 'position'=>31, 'enabled'=>'! empty($conf->propal->enabled) && ! empty($conf->facture->enabled)', 'picto'=>'propal','warning'=>''),
+	// Automatic classification invoice
+	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array('family'=>'classify_order', 'position'=>40, 'enabled'=>'! empty($conf->expedition->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
 	// For the following 2 options, if module invoice is disabled, they does not exists, so "Classify billed" for order must be done manually from order card.
-	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify', 'position'=>50, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>''),
-    'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify', 'position'=>40, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'bill','warning'=>''),
-	'WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING'=>array('family'=>'classify', 'position'=>30, 'enabled'=>'! empty($conf->expedition->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order'),
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify_order', 'position'=>41, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order','warning'=>''),
+    //Moved as hidden feature: 'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('family'=>'classify_order', 'position'=>42, 'enabled'=>'! empty($conf->facture->enabled) && ! empty($conf->commande->enabled)', 'picto'=>'order','warning'=>''),
+    'separator2'=>array('family'=>'separator', 'position'=>50),
+	// Automatic classification supplier proposal
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL'=>array('family'=>'classify_supplier_proposal', 'position'=>60, 'enabled'=>'! empty($conf->supplier_proposal->enabled) && ! empty($conf->fournisseur->enabled)', 'picto'=>'propal','warning'=>''),
+	// Automatic classification supplier order
+	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER'=>array('family'=>'classify_supplier_order', 'position'=>62, 'enabled'=>'! empty($conf->fournisseur->enabled)', 'picto'=>'order','warning'=>''),
 );
 
 if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow']))
@@ -93,27 +97,53 @@ if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['
 	}
 }
 
-// TODO We must sort on position here
+// Sort on position
+$workflowcodes = dol_sort_array($workflowcodes, 'position');
 
 $nbqualified=0;
 $oldfamily='';
 
+print '<table class="noborder" width="100%">'."\n";
+
 foreach($workflowcodes as $key => $params)
 {
 	$picto=$params['picto'];
 	$enabled=$params['enabled'];
 	$family=$params['family'];
-   	if (! verifCond($enabled)) continue;
+
+	if ($family == 'separator')
+	{
+		print '</table><br>';
+		print '<table class="noborder" width="100%">'."\n";
+
+		continue;
+	}
+
+	if (! verifCond($enabled)) continue;
 
    	$nbqualified++;
 
+
    	if ($oldfamily != $family)
    	{
 	   	print '<tr class="liste_titre">'."\n";
 		print '  <td>';
-		if ($family == 'create') print $langs->trans("AutomaticCreation");
-		elseif ($family == 'classify') print $langs->trans("AutomaticClassification");
-		else print $langs->trans("Description");
+		if ($family == 'create')
+		{
+			print $langs->trans("AutomaticCreation");
+		}
+		elseif (preg_match('/classify_(.*)/', $family, $reg))
+		{
+			print $langs->trans("AutomaticClassification");
+			if ($reg[1] == 'proposal') print ' - '.$langs->trans('Proposal');
+			if ($reg[1] == 'order') print ' - '.$langs->trans('Order');
+			if ($reg[1] == 'supplier_proposal') print ' - '.$langs->trans('SupplierProposal');
+			if ($reg[1] == 'supplier_order') print ' - '.$langs->trans('SupplierOrder');
+		}
+		else
+		{
+			print $langs->trans("Description");
+		}
 		print '</td>';
 		print '  <td align="center">'.$langs->trans("Status").'</td>';
 		print "</tr>\n";

htdocs/api/class/api_documents.class.php

@@ -23,8 +23,6 @@ use Luracast\Restler\Format\UploadFormat;
 
 require_once DOL_DOCUMENT_ROOT.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 /**
  * API class for receive files
@@ -119,6 +117,20 @@ class Documents extends DolibarrApi
 					throw new RestException(500, 'Error generating document');
 				}
 			}
+                        if ($module_part == 'commande' || $module_part == 'order')
+                        {
+                                require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+                                $this->order = new Commande($this->db);
+                                $result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
+                                if( ! $result ) {
+                                        throw new RestException(404, 'Order not found');
+                                }
+                                $result = $this->order->generateDocument($this->order->modelpdf, $langs, $hidedetails, $hidedesc, $hideref);
+                                if( $result <= 0 ) {
+                                        throw new RestException(500, 'Error generating document');
+                                }
+                        }
+
 		}
 
 		$filename = basename($original_file);
@@ -163,6 +175,8 @@ class Documents extends DolibarrApi
 
 		if ($modulepart == 'societe' || $modulepart == 'thirdparty')
 		{
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+
 			if (!DolibarrApiAccess::$user->rights->societe->lire) {
 				throw new RestException(401);
 			}
@@ -225,7 +239,7 @@ class Documents extends DolibarrApi
 	 * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
 	 * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
 	 *
-	 * @param   string  $filename           Name of file to create ('FA1705-0123')
+	 * @param   string  $filename           Name of file to create ('FA1705-0123.txt')
 	 * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...)
 	 * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
 	 * @param   string  $subdir             Subdirectory (Only if ref not provided)
@@ -271,15 +285,20 @@ class Documents extends DolibarrApi
 			if ($modulepart == 'facture' || $modulepart == 'invoice')
 			{
 				$modulepart='facture';
+
+				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$object = new Facture($this->db);
 			}
 			elseif ($modulepart == 'project')
 			{
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$object = new Project($this->db);
 			}
 			elseif ($modulepart == 'task' || $modulepart == 'project_task')
 			{
 				$modulepart = 'project_task';
+
+				require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 				$object = new Task($this->db);
 
 				$task_result = $object->fetch('', $ref);

htdocs/api/class/api_setup.class.php

@@ -208,6 +208,68 @@ class Setup extends DolibarrApi
         return $this->_cleanObjectDatas($country);
     }
 
+    /**
+     * Get the list of delivery times.
+     *
+     * @param string    $sortfield  Sort field
+     * @param string    $sortorder  Sort order
+     * @param int       $limit      Number of items per page
+     * @param int       $page       Page number {@min 0}
+     * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
+     * @param string    $sqlfilters SQL criteria to filter with.
+     *
+     * @url     GET dictionary/availability
+     *
+     * @return array [List of availability]
+     *
+     * @throws 400 RestException
+     * @throws 200 OK
+     */
+    function getAvailability($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+    {
+        $list = array();
+
+        $sql = "SELECT rowid, code, label";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_availability as t";
+        $sql.= " WHERE t.active = ".$active;
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+            }
+                  $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        if ($limit) {
+            if ($page < 0) {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql .= $this->db->plimit($limit, $offset);
+        }
+
+        $result = $this->db->query($sql);
+
+        if ($result) {
+            $num = $this->db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            for ($i = 0; $i < $min; $i++) {
+                $list[] = $this->db->fetch_object($result);
+            }
+        } else {
+            throw new RestException(400, $this->db->lasterror());
+        }
+
+        return $list;
+    }
+
     /**
      * Clean sensible object datas
      *

htdocs/api/index.php

@@ -96,7 +96,7 @@ preg_match('/index\.php\/([^\/]+)(.*)$/', $_SERVER["PHP_SELF"], $reg);
 
 // Set the flag to say to refresh (when we reload the explorer, production must be for API call only)
 $refreshcache=false;
-if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
+if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
     $refreshcache=true;
 }
@@ -109,7 +109,7 @@ $api = new DolibarrApi($db, '', $refreshcache);
 // See https://github.com/Luracast/Restler-API-Explorer for more info.
 $api->r->addAPIClass('Luracast\\Restler\\Explorer');
 
-$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');
+$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');	// 'YamlFormat'
 $api->r->addAuthenticationClass('DolibarrApiAccess','');
 
 // Define accepted mime types
@@ -118,7 +118,7 @@ UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain',
 
 
 // Call Explorer file for all APIs definitions
-if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
+if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
     // Scan all API files to load them
 
@@ -164,7 +164,7 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
                                 if ($file_searched == 'api_access.class.php') continue;
 
                                 // Support of the deprecated API.
-                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_deprecated_(.*)\.class\.php$/i",$file_searched,$regapi))
+                                /*if (is_readable($dir_part.$file_searched) && preg_match("/^api_deprecated_(.*)\.class\.php$/i",$file_searched,$regapi))
                                 {
                                     $classname = ucwords($regapi[1]).'Api';
                                     require_once $dir_part.$file_searched;
@@ -178,7 +178,8 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
                                         dol_syslog("We found an api_xxx file (".$file_searched.") but class ".$classname." does not exists after loading file", LOG_WARNING);
                                     }
                                 }
-                                elseif (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$regapi))
+                                else*/
+                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$regapi))
                                 {
                                     $classname = ucwords($regapi[1]);
                                     $classname = str_replace('_', '', $classname);
@@ -213,15 +214,16 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/resources.json' |
     {
         $api->r->addAPIClass($classname, $apiname);
     }
+    //var_dump($api->r);
 }
 
 // Call one APIs or one definition of an API
-if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/resources.json' && preg_match('/^\/resources.json\/(.+)$/', $reg[2], $regbis) && $regbis[1] != 'root')))
+if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
     $module = $reg[1];
     if ($module == 'explorer')  // If we call page to explore details of a service
     {
-        $module = $regbis[1];
+        $module = $regbis[2];
     }
 
     $module=strtolower($module);

htdocs/bookmarks/bookmarks.lib.php

@@ -76,13 +76,16 @@ function printBookmarksList($aDb, $aLangs)
 		$ret.= '<form id="actionbookmark" name="actionbookmark" method="POST" action="">';
 		$ret.= '<select name="bookmark" id="boxbookmark" class="flat boxcombo vmenusearchselectcombo" alt="Bookmarks">';
 		$ret.= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
-	    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'">'.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+	    $ret.= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'" ';
+	    $ret.= ' html="'.dol_escape_htmltag('<span class="fa fa-star-o"></span> '.dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...').'">';
+	    $ret.= dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
 		// Url to go on create new bookmark page
 		if (! empty($user->rights->bookmark->creer))
 		{
 	    	//$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;urlsource='.urlencode($url).'&amp;url='.urlencode($url);
 		    $urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
-	    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'...</option>';
+	    	$ret.= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'"';
+	    	$ret.= ' html="'.dol_escape_htmltag('<span class="fa fa-star-o"></span> '.$langs->trans('AddThisPageToBookmarks').'...').'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks').'...').'</option>';
 		}
 		// Menu with all bookmarks
 		if (! empty($conf->global->BOOKMARKS_SHOW_IN_MENU))
@@ -96,9 +99,9 @@ function printBookmarksList($aDb, $aLangs)
 				$i=0;
 				while ($i < $conf->global->BOOKMARKS_SHOW_IN_MENU && $obj = $db->fetch_object($resql))
 				{
-				    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'">';
-				    //$ret.='<span class="fa fa-print">aa</span>';
-				    $ret.=img_picto('','object_bookmark').' ';
+				    $ret.='<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1?' target="_blank"':'').' rel="'.dol_escape_htmltag($obj->url).'"';
+				    //$ret.=' html="'.dol_escape_htmltag('<span class="fa fa-print"></span> '.$obj->title).'"';
+				    $ret.='>';
 				    $ret.=dol_escape_htmltag($obj->title);
 				    $ret.='</option>';
 					$i++;

htdocs/bookmarks/list.php

@@ -107,9 +107,9 @@ if ($resql)
 
 	print "<tr class=\"liste_titre\">";
 	//print "<td>&nbsp;</td>";
-	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"rowid","", $param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre("Title",$_SERVER["PHP_SELF"],"title","", $param,'align="left"',$sortfield,$sortorder);
-	print_liste_field_titre("Link",'','');
+	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"b.rowid","", $param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre("Title",$_SERVER["PHP_SELF"],"b.title","", $param,'align="left"',$sortfield,$sortorder);
+	print_liste_field_titre("Link",$_SERVER["PHP_SELF"],"b.url","", $param,'align="left"',$sortfield,$sortorder);
 	print_liste_field_titre("Target",'','','','','align="center"');
 	print_liste_field_titre("Owner",$_SERVER["PHP_SELF"],"u.lastname","", $param,'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"b.dateb","", $param,'align="center"',$sortfield,$sortorder);

htdocs/cashdesk/facturation_verif.php

@@ -114,10 +114,13 @@ switch($action)
 					    {
 					        if (count($prodcustprice->lines) > 0)
 					        {
-					            $pu_ht = price($prodcustprice->lines [0]->price);
-					            $pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-					            $price_base_type = $prodcustprice->lines [0]->price_base_type;
-					            $tva_tx = $prodcustprice->lines [0]->tva_tx;
+					            $pu_ht = price($prodcustprice->lines[0]->price);
+					            $pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+					            $price_base_type = $prodcustprice->lines[0]->price_base_type;
+					            $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;
 					        }
 					    }
 					    else

htdocs/comm/action/card.php

@@ -771,9 +771,9 @@ if ($action == 'create')
 		$events[]=array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php?showempty=1',1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 		//For external user force the company to user company
 		if (!empty($user->societe_id)) {
-			print $form->select_company($user->societe_id, 'socid', '', 1, 1, 0, $events);
+			print $form->select_company($user->societe_id, 'socid', '', 1, 1, 0, $events, 0, 'minwidth300');
 		} else {
-			print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events);
+			print $form->select_company('', 'socid', '', 'SelectThirdParty', 1, 0, $events, 0, 'minwidth300');
 		}
 
 	}
@@ -781,7 +781,7 @@ if ($action == 'create')
 
 	// Related contact
 	print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
-	$form->selectcontacts(GETPOST('socid','int'), GETPOST('contactid'), 'contactid', 1, '', '', 0, 'minwidth200');
+	print $form->selectcontacts(GETPOST('socid','int'), GETPOST('contactid'), 'contactid', 1, '', '', 0, 'minwidth300');
 	print '</td></tr>';
 
 
@@ -985,7 +985,7 @@ if ($id > 0)
 		else $form->select_date($datef?$datef:$object->datef,'p2',1,1,1,"action",1,1,0,0,'fulldayend');
 		print '</td></tr>';
 
-		$userepeatevent=0;	// Dev in progress
+		$userepeatevent=($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);	// Dev in progress
 		if ($userepeatevent)
 		{
 			// Repeat
@@ -1198,7 +1198,7 @@ if ($id > 0)
 		}
 
 		$linkback =img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
-		$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
+		$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
 
 		// Link to other agenda views
 		$out='';
@@ -1324,6 +1324,8 @@ if ($id > 0)
 		print '</div>';
 		if ($object->datep != $object->datef && in_array($user->id,array_keys($listofuserid)))
 		{
+			//var_dump($object->userassigned);
+			//var_dump($listofuserid);
 			print '<div class="myavailability">';
 			print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
 			print '</div>';

htdocs/comm/action/class/actioncomm.class.php

@@ -225,11 +225,11 @@ class ActionComm extends CommonObject
         if ($this->elementtype=='commande') $this->elementtype='order';
         if ($this->elementtype=='contrat')  $this->elementtype='contract';
 
-        if (! is_array($this->userassigned) && ! empty($this->userassigned))	// For backward compatibility
+        if (! is_array($this->userassigned) && ! empty($this->userassigned))	// For backward compatibility when userassigned was an int instead fo array
         {
         	$tmpid=$this->userassigned;
         	$this->userassigned=array();
-        	$this->userassigned[$tmpid]=array('id'=>$tmpid);
+        	$this->userassigned[$tmpid]=array('id'=>$tmpid, 'transparency'=>$this->transparency);
         }
 
         if (is_object($this->contact) && isset($this->contact->id) && $this->contact->id > 0 && ! ($this->contactid > 0)) $this->contactid = $this->contact->id;		// For backward compatibility. Using this->contact->xx is deprecated
@@ -240,7 +240,7 @@ class ActionComm extends CommonObject
 
         // Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
         if (empty($this->userassigned) || count($this->userassigned) == 0 || ! is_array($this->userassigned))
-        	$this->userassigned = array($userownerid=>array('id'=>$userownerid));
+        	$this->userassigned = array($userownerid=>array('id'=>$userownerid, 'transparency'=>$this->transparency));
 
         if (! $this->type_id || ! $this->type_code)
         {
@@ -943,7 +943,7 @@ class ActionComm extends CommonObject
 	    		$response = new WorkboardResponse();
 	    		$response->warning_delay = $conf->agenda->warning_delay/60/60/24;
 	    		$response->label = $langs->trans("ActionsToDo");
-	    		$response->url = DOL_URL_ROOT.'/comm/action/listactions.php?status=todo&mainmenu=agenda';
+	    		$response->url = DOL_URL_ROOT.'/comm/action/list.php?status=todo&mainmenu=agenda';
 	    		if ($user->rights->agenda->allactions->read) $response->url.='&filtert=-1';
 	    		$response->img = img_object('',"action",'class="inline-block valigntextmiddle"');
     		}

htdocs/comm/action/document.php

@@ -124,7 +124,7 @@ if ($object->id > 0)
 	dol_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
 	$linkback = img_picto($langs->trans("BackToList"),'object_list','class="hideonsmartphone pictoactionview"');
-	$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">'.$langs->trans("BackToList").'</a>';
+	$linkback.= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php">'.$langs->trans("BackToList").'</a>';
 
 	// Link to other agenda views
 	$out='';

htdocs/comm/action/index.php

@@ -138,7 +138,7 @@ if (GETPOST("viewlist") || $action == 'show_list')
         }
     }
     //print $param;
-    header("Location: ".DOL_URL_ROOT.'/comm/action/listactions.php?'.$param);
+    header("Location: ".DOL_URL_ROOT.'/comm/action/list.php?'.$param);
     exit;
 }
 
@@ -392,7 +392,7 @@ if (! empty($conf->use_javascript_ajax))	// If javascript on
 	$s.='</script>' . "\n";
 
 	// Local calendar
-	$s.='<div class="nowrap clear float minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
+	$s.='<div class="nowrap clear inline-block minheight20"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> ' . $langs->trans("LocalAgenda").' &nbsp; </div>';
 
 	// External calendars
 	if (is_array($showextcals) && count($showextcals) > 0)
@@ -409,12 +409,12 @@ if (! empty($conf->use_javascript_ajax))	// If javascript on
 		foreach ($showextcals as $val)
 		{
 			$htmlname = md5($val['name']);
-			$s.='<div class="nowrap float"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val['name'] . ' &nbsp; </div>';
+			$s.='<div class="nowrap inline-block"><input type="checkbox" id="check_ext' . $htmlname . '" name="check_ext' . $htmlname . '" checked> ' . $val['name'] . ' &nbsp; </div>';
 		}
 	}
 
 	// Birthdays
-	$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
+	$s.='<div class="nowrap inline-block"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 	// Calendars from hooks
     $parameters=array(); $object=null;
@@ -1375,7 +1375,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
                     print '>';
                     print '<table class="centpercent cal_event'.(empty($event->transparency)?'':' cal_event_busy').'" style="'.$h;
                     print 'background: #'.$color.';';
-                    print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -4).'), to(#'.dol_color_minus($color, -3).'));';
+                    print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
                     //if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
                     //else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
                     //print ' -moz-border-radius:4px;"';

htdocs/comm/action/list.php

@@ -20,7 +20,7 @@
  */
 
 /**
- *	    \file       htdocs/comm/action/listactions.php
+ *	    \file       htdocs/comm/action/list.php
  *      \ingroup    agenda
  *		\brief      Page to list actions
  */
@@ -70,6 +70,12 @@ $filtert = GETPOST("filtert","int",3);
 $usergroup = GETPOST("usergroup","int",3);
 $showbirthday = empty($conf->use_javascript_ajax)?GETPOST("showbirthday","int"):1;
 
+$contextpage='actioncommlist';
+
+$extrafields = new ExtraFields($db);
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('actioncomm');
+$search_array_options=$extrafields->getOptionalsFromPost($extralabels,'','search_');
 // If not choice done on calendar owner, we filter on user.
 if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
 {
@@ -112,6 +118,27 @@ if (! $user->rights->agenda->allactions->read || $filter=='mine')	// If no permi
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('agendalist'));
 
+$arrayfields=array(
+	'a.id'=>array('label'=>"Ref", 'checked'=>1),
+	'owner'=>array('label'=>"Owner", 'checked'=>1),
+	'a.label'=>array('label'=>"Title", 'checked'=>1),
+	'c.libelle'=>array('label'=>"Type", 'checked'=>1),
+	'a.datep'=>array('label'=>"DateStart", 'checked'=>1),
+	'a.datep2'=>array('label'=>"DateEnd", 'checked'=>1),
+	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
+	'a.fk_contact'=>array('label'=>"Contact", 'checked'=>1),
+	'a.fk_element'=>array('label'=>"LinkedObject", 'checked'=>$checkedsuppliercode, 'enabled'=>(! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))),
+	'a.percent'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
+
+);
+// Extra fields
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+{
+   foreach($extrafields->attribute_label as $key => $val)
+   {
+		 $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>$extrafields->attribute_list[$key], 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>$extrafields->attribute_perms[$key]);
+   }
+}
 
 /*
  *	Actions
@@ -136,6 +163,8 @@ $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+// Selection of new fields
+include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
@@ -143,6 +172,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
     $search_title='';
     $datestart='';
     $dateend='';
+    $search_array_options=array();
 }
 
 
@@ -191,6 +221,13 @@ if (GETPOST('datestartyear','int')) $param.='&datestartyear='.GETPOST('datestart
 if (GETPOST('dateendday','int')) $param.='&dateendday='.GETPOST('dateendday','int');
 if (GETPOST('dateendmonth','int')) $param.='&dateendmonth='.GETPOST('dateendmonth','int');
 if (GETPOST('dateendyear','int')) $param.='&dateendyear='.GETPOST('dateendyear','int');
+// Add $param from extra fields
+foreach ($search_array_options as $key => $val)
+{
+	$crit=$val;
+	$tmpkey=preg_replace('/search_options_/','',$key);
+	if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
+}
 
 $sql = "SELECT";
 if ($usergroup > 0) $sql.=" DISTINCT";
@@ -201,10 +238,14 @@ $sql.= " a.fk_contact, a.note, a.percent as percent,";
 $sql.= " a.fk_element, a.elementtype,";
 $sql.= " c.code as type_code, c.libelle as type_label,";
 $sql.= " sp.lastname, sp.firstname";
-$sql.= " FROM ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."actioncomm as a";
+// Add fields from extrafields
+foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
+$sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
+$sql.=" LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_extrafields as ef ON (a.id = ef.fk_object) ";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+$sql.=" ,".MAIN_DB_PREFIX."c_actioncomm as c";
 // We must filter on resource table
 if ($resourceid > 0) $sql.=", ".MAIN_DB_PREFIX."element_resources as r";
 // We must filter on assignement table
@@ -238,7 +279,7 @@ if (! empty($actioncode))
  		else
  		{
  	        	$sql.=" AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
- 		}		
+ 		}
         }
     }
 }
@@ -269,6 +310,20 @@ if ($filtert > 0 || $usergroup > 0)
 if ($dateselect > 0) $sql.= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect-3600)."' AND a.datep <= '".$db->idate($dateselect+3600*24-1)."'))";
 if ($datestart > 0) $sql.= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart+3600*24-1)."'";
 if ($dateend > 0) $sql.= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend+3600*24-1)."'";
+// Add where from extra fields
+foreach ($search_array_options as $key => $val)
+{
+	$crit=$val;
+	$tmpkey=preg_replace('/search_options_/','',$key);
+	$typ=$extrafields->attribute_type[$tmpkey];
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+	{
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
+	}
+}
 $sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = '';
@@ -281,7 +336,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql.= $db->plimit($limit + 1, $offset);
 //print $sql;
 
-dol_syslog("comm/action/listactions.php", LOG_DEBUG);
+dol_syslog("comm/action/list.php", LOG_DEBUG);
 $resql=$db->query($sql);
 if ($resql)
 {
@@ -376,27 +431,70 @@ if ($resql)
 
     $moreforfilter='';
 
+	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+	if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
     $i = 0;
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"><input type="text" name="search_title" value="'.$search_title.'"></td>';
-    print '<td class="liste_titre" align="center">';
-	print $form->select_date($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1);
-	print '</td>';
-	print '<td class="liste_titre" align="center">';
-	print $form->select_date($dateend, 'dateend', 0, 0, 1, '', 1, 0, 1);
-	print '</td>';
-	print '<td class="liste_titre"></td>';
-	print '<td class="liste_titre"></td>';
-    if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) print '<td class="liste_titre"></td>';
-    print '<td class="liste_titre center">';
-    print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
-    print '</td>';
+	if (! empty($arrayfields['a.id']['checked']))		print '<td class="liste_titre"></td>';
+	if (! empty($arrayfields['owner']['checked']))		print '<td class="liste_titre"></td>';
+	if (! empty($arrayfields['c.libelle']['checked']))	print '<td class="liste_titre"></td>';
+	if (! empty($arrayfields['a.label']['checked']))	print '<td class="liste_titre"><input type="text" name="search_title" value="'.$search_title.'"></td>';
+	if (! empty($arrayfields['a.datep']['checked']))	{
+		print '<td class="liste_titre" align="center">';
+		print $form->select_date($datestart, 'datestart', 0, 0, 1, '', 1, 0, 1);
+		print '</td>';
+	}
+	if (! empty($arrayfields['a.datep2']['checked']))	{
+		print '<td class="liste_titre" align="center">';
+		print $form->select_date($dateend, 'dateend', 0, 0, 1, '', 1, 0, 1);
+		print '</td>';
+	}
+	if (! empty($arrayfields['s.nom']['checked']))			print '<td class="liste_titre"></td>';
+	if (! empty($arrayfields['a.fk_contact']['checked']))	print '<td class="liste_titre"></td>';
+	if (! empty($arrayfields['a.fk_element']['checked']))	print '<td class="liste_titre"></td>';
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+	   foreach($extrafields->attribute_label as $key => $val)
+	   {
+			if (! empty($arrayfields["ef.".$key]['checked']))
+			{
+				$align=$extrafields->getAlignFlag($key);
+				$typeofextrafield=$extrafields->attribute_type[$key];
+				print '<td class="liste_titre'.($align?' '.$align:'').'">';
+				if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attribute_computed[$key]))
+				{
+					$crit=$val;
+					$tmpkey=preg_replace('/search_options_/','',$key);
+					$searchclass='';
+					if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
+					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+					print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
+				}
+				else
+				{
+					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
+					echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_');
+				}
+				print '</td>';
+			}
+	   }
+	}
+	// Fields from hook
+	$parameters=array('arrayfields'=>$arrayfields);
+	$reshook=$hookmanager->executeHooks('printFieldListOption',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+
+    if (! empty($arrayfields['a.percent']['checked']))	{
+		print '<td class="liste_titre center">';
+    	print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
+    	print '</td>';
+    }
 	// Action column
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto=$form->showFilterButtons();
@@ -405,18 +503,37 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"a.id",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre("ActionsOwnedByShort",$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+	if (! empty($arrayfields['a.id']['checked']))	      print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"],"a.id",$param,"","",$sortfield,$sortorder);
+	if (! empty($arrayfields['owner']['checked']))        print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+	if (! empty($arrayfields['c.libelle']['checked']))	  print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"],"c.libelle",$param,"","",$sortfield,$sortorder);
+	if (! empty($arrayfields['a.label']['checked']))	  print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
 	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"c.libelle",$param,"","",$sortfield,$sortorder);
-    print_liste_field_titre("Label",$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("DateStart",$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
-	print_liste_field_titre("DateEnd",$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
-	print_liste_field_titre("ThirdParty",$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
-    if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) print_liste_field_titre("LinkedObject",$_SERVER["PHP_SELF"],"a.fk_element",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
-	print_liste_field_titre("");
+	if (! empty($arrayfields['a.datep']['checked']))	  print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['a.datep2']['checked']))	  print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder);
+	if (! empty($arrayfields['s.nom']['checked']))	      print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder);
+	if (! empty($arrayfields['a.fk_contact']['checked'])) print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder);
+    if (! empty($arrayfields['a.fk_element']['checked'])) print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"],"a.fk_element",$param,"","",$sortfield,$sortorder);
+
+	// Extra fields
+	if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
+	{
+		foreach($extrafields->attribute_label as $key => $val)
+		{
+			if (! empty($arrayfields["ef.".$key]['checked']))
+			{
+				$align=$extrafields->getAlignFlag($key);
+				$sortonfield = "ef.".$key;
+				if (! empty($extrafields->attribute_computed[$key])) $sortonfield='';
+				print_liste_field_titre($extralabels[$key],$_SERVER["PHP_SELF"],$sortonfield,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
+			}
+		}
+	}
+	// Hook fields
+	$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
+	$reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	if (! empty($arrayfields['a.percent']['checked']))print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
 	print "</tr>\n";
 
 	$contactstatic = new Contact($db);
@@ -448,103 +565,138 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 
-		// Ref
-		print '<td>';
-		print $actionstatic->getNomUrl(1,-1);
-		print '</td>';
+		if (! empty($arrayfields['a.id']['checked'])) {
+			// Ref
+			print '<td>';
+			print $actionstatic->getNomUrl(1,-1);
+			print '</td>';
+		}
 
 		// User owner
-		print '<td class="tdoverflowmax100">';
-		if ($obj->fk_user_action > 0)
+		if (! empty($arrayfields['owner']['checked']))
 		{
-			$userstatic->fetch($obj->fk_user_action);
-			print $userstatic->getNomUrl(-1);
+			print '<td class="'.($conf->browser->name != 'chrome'?'':'tdoverflowmax100').'">';	// With edge and chrom 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);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
+		if (! empty($arrayfields['c.libelle']['checked'])) {
+			// Type
+			print '<td>';
+			if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+			{
+	    		if ($actionstatic->type_picto) print img_picto('', $actionstatic->type_picto);
+    			else {
+    			    if ($actionstatic->type_code == 'AC_RDV')   print img_picto('', 'object_group').' ';
+    			    if ($actionstatic->type_code == 'AC_TEL')   print img_picto('', 'object_phoning').' ';
+    			    if ($actionstatic->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax').' ';
+    			    if ($actionstatic->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
+    			}
+			}
+			$labeltype=$obj->type_code;
+			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype='AC_OTH';
+			if (! empty($arraylist[$labeltype])) $labeltype=$arraylist[$labeltype];
+			print dol_trunc($labeltype,28);
+			print '</td>';
+		}
+		if (! empty($arrayfields['a.label']['checked'])) {
+			// Label
+			print '<td class="tdoverflowmax300">';
+			print $actionstatic->label;
+			print '</td>';
 		}
-		else print '&nbsp;';
-		print '</td>';
 
-		// Type
-		print '<td>';
-		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+		if (! empty($arrayfields['a.datep']['checked'])) {
+			// Start date
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->dp),"dayhour");
+			$late=0;
+			if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
+			if ($obj->percent == 0 && ! $obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
+			if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) $late=1;
+			if ($obj->percent > 0 && $obj->percent < 100 && ! $obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
+			if ($late) print img_warning($langs->trans("Late")).' ';
+			print '</td>';
+		}
+		if (! empty($arrayfields['a.datep2']['checked'])) {
+			// End date
+			print '<td align="center" class="nowrap">';
+			print dol_print_date($db->jdate($obj->dp2),"dayhour");
+			print '</td>';
+		}
+		if (! empty($arrayfields['s.nom']['checked'])) {
+			// Third party
+			print '<td class="tdoverflowmax100">';
+			if ($obj->socid)
+			{
+				$societestatic->id=$obj->socid;
+				$societestatic->client=$obj->client;
+				$societestatic->name=$obj->societe;
+				print $societestatic->getNomUrl(1,'',28);
+			}
+			else print '&nbsp;';
+			print '</td>';
+		}
+		if (! empty($arrayfields['a.fk_contact']['checked'])) {
+			// Contact
+			print '<td>';
+			if ($obj->fk_contact > 0)
+			{
+				$contactstatic->lastname=$obj->lastname;
+				$contactstatic->firstname=$obj->firstname;
+				$contactstatic->id=$obj->fk_contact;
+				print $contactstatic->getNomUrl(1,'',28);
+			}
+			else
+			{
+				print "&nbsp;";
+			}
+			print '</td>';
+		}
+		if (! empty($arrayfields['a.fk_element']['checked'])) {
+		        // Linked object
+		        print '<td>';
+		        if ($obj->fk_element > 0 && ! empty($obj->elementtype)) {
+              		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		            print dolGetElementUrl($obj->fk_element,$obj->elementtype,1);
+		        } else {
+              		print "&nbsp;";
+		        }
+		        print '</td>';
+
+		}
+		// Extra fields
+		if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 		{
-    		if ($actionstatic->type_picto) print img_picto('', $actionstatic->type_picto);
-    		else {
-    		    if ($actionstatic->type_code == 'AC_RDV')   print img_picto('', 'object_group').' ';
-    		    if ($actionstatic->type_code == 'AC_TEL')   print img_picto('', 'object_phoning').' ';
-    		    if ($actionstatic->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax').' ';
-    		    if ($actionstatic->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
-    		}
+		   foreach($extrafields->attribute_label as $key => $val)
+		   {
+				if (! empty($arrayfields["ef.".$key]['checked']))
+				{
+					print '<td';
+					$align=$extrafields->getAlignFlag($key);
+					if ($align) print ' align="'.$align.'"';
+					print '>';
+					$tmpkey='options_'.$key;
+					print $extrafields->showOutputField($key, $obj->$tmpkey, '', 1);
+					print '</td>';
+					if (! $i) $totalarray['nbfield']++;
+				}
+		   }
 		}
-		$labeltype=$obj->type_code;
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype='AC_OTH';
-		if (! empty($arraylist[$labeltype])) $labeltype=$arraylist[$labeltype];
-		print dol_trunc($labeltype,28);
-		print '</td>';
+		// Fields from hook
+		$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+		$reshook=$hookmanager->executeHooks('printFieldListValue',$parameters);    // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
 
-		// Label
-		print '<td class="tdoverflowmax300">';
-		print $actionstatic->label;
-		print '</td>';
-
-		// Start date
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->dp),"dayhour");
-		$late=0;
-		if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
-		if ($obj->percent == 0 && ! $obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
-		if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) $late=1;
-		if ($obj->percent > 0 && $obj->percent < 100 && ! $obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1;
-		if ($late) print img_warning($langs->trans("Late")).' ';
-		print '</td>';
-
-		// End date
-		print '<td align="center" class="nowrap">';
-		print dol_print_date($db->jdate($obj->dp2),"dayhour");
-		print '</td>';
-
-		// Third party
-		print '<td class="tdoverflowmax100">';
-		if ($obj->socid)
-		{
-			$societestatic->id=$obj->socid;
-			$societestatic->client=$obj->client;
-			$societestatic->name=$obj->societe;
-			print $societestatic->getNomUrl(1,'',28);
+		if (! empty($arrayfields['a.percent']['checked'])) {
+			// Status/Percent
+			$datep=$db->jdate($obj->datep);
+			print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent,3,0,$datep).'</td>';
 		}
-		else print '&nbsp;';
-		print '</td>';
-
-		// Contact
-		print '<td>';
-		if ($obj->fk_contact > 0)
-		{
-			$contactstatic->lastname=$obj->lastname;
-			$contactstatic->firstname=$obj->firstname;
-			$contactstatic->id=$obj->fk_contact;
-			print $contactstatic->getNomUrl(1,'',28);
-		}
-		else
-		{
-			print "&nbsp;";
-		}
-		print '</td>';
-
-        // Linked object
-        if (! empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {
-            print '<td>';
-            if ($obj->fk_element > 0 && ! empty($obj->elementtype)) {
-                include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-                print dolGetElementUrl($obj->fk_element,$obj->elementtype,1);
-            } else {
-                print "&nbsp;";
-            }
-            print '</td>';
-        }
-
-		// Status/Percent
-		$datep=$db->jdate($obj->datep);
-		print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent,3,0,$datep).'</td>';
-
 		print '<td></td>';
 
 		print "</tr>\n";

htdocs/comm/action/pertype.php

@@ -724,7 +724,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/list.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */

htdocs/comm/action/peruser.php

@@ -839,7 +839,7 @@ jQuery(document).ready(function() {
 		else if (ids.indexOf(",") > -1)	/* There is several events */
 		{
 			/* alert(\'several events\'); */
-			url = "'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
+			url = "'.DOL_URL_ROOT.'/comm/action/list.php?filtert="+userid+"&dateselectyear="+year+"&dateselectmonth="+month+"&dateselectday="+day;
 			window.location.href = url;
 		}
 		else	/* One event */

htdocs/comm/action/rapport/index.php

@@ -170,15 +170,15 @@ if ($resql)
 				$out='';
 
 				// Show file name with link to download
-				$tmp = $formfile->showPreview($filearray,$modulepart,$relativepath,0,$param);
-				$out.= ($tmp?$tmp.' ':'');
 				$out.= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 				$mime=dol_mimetype($relativepath,'',0);
 				if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
 				$out.= ' target="_blank">';
-				$out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]).' '.$filearray["name"];
+				$out.= img_mime($filearray["name"],$langs->trans("File").': '.$filearray["name"]);
+				$out.= $filearray["name"];
 				$out.= '</a>'."\n";
-                print $out;
+				$out.= $formfile->showPreview($filearray,$modulepart,$relativepath,0,$param);
+				print $out;
 
 				print '</td>';
 				print '<td align="center">'.dol_print_date(dol_filemtime($file),'dayhour').'</td>';

htdocs/comm/index.php

@@ -109,7 +109,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     {
         $listofsearchfields['search_contract']=array('text'=>'Contract');
     }
-    
+
     if (count($listofsearchfields))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
@@ -125,7 +125,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     		print '</tr>';
     		$i++;
     	}
-    	print '</table>';	
+    	print '</table>';
     	print '</form>';
     	print '<br>';
     }
@@ -155,7 +155,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 	{
 		$total = 0;
 		$num = $db->num_rows($resql);
-	    
+
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("ProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
@@ -167,7 +167,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
-				
+
 				print '<tr class="oddeven"><td  class="nowrap">';
 				$propalstatic->id=$obj->rowid;
 				$propalstatic->ref=$obj->ref;
@@ -192,13 +192,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			}
 			if ($total>0)
 			{
-				
+
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
 			}
 		}
 		else
 		{
-			
+
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
 		}
 		print "</table><br>";
@@ -236,7 +236,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
     {
         $total = 0;
         $num = $db->num_rows($resql);
-         
+
         print '<table class="noborder" width="100%">';
         print '<tr class="liste_titre">';
         print '<th colspan="3">'.$langs->trans("SupplierProposalsDraft").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
@@ -248,7 +248,7 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
             while ($i < $num)
             {
                 $obj = $db->fetch_object($resql);
-                
+
                 print '<tr class="oddeven"><td  class="nowrap">';
                 $supplierproposalstatic->id=$obj->rowid;
                 $supplierproposalstatic->ref=$obj->ref;
@@ -272,13 +272,13 @@ if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_propos
             }
             if ($total>0)
             {
-                
+
                 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         }
         else
         {
-            
+
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoProposal").'</td></tr>';
         }
         print "</table><br>";
@@ -315,7 +315,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		$total = 0;
 		$num = $db->num_rows($resql);
-	    
+
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("DraftOrders").($num?' <span class="badge">'.$num.'</span>':'').'</th></tr>';
@@ -326,7 +326,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			$i = 0;
 			while ($i < $num)
 			{
-				
+
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td class="nowrap">';
                 $orderstatic->id=$obj->rowid;
@@ -352,13 +352,13 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			}
 			if ($total>0)
 			{
-				
+
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
 			}
 		}
 		else
 		{
-			
+
 			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table><br>";
@@ -407,7 +407,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
             $i = 0;
             while ($i < $num)
             {
-                
+
                 $obj = $db->fetch_object($resql);
                 print '<tr class="oddeven"><td class="nowrap">';
                 $supplierorderstatic->id=$obj->rowid;
@@ -433,13 +433,13 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande
             }
             if ($total>0)
             {
-                
+
                 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" align="right">'.price($total)."</td></tr>";
             }
         }
         else
         {
-			
+
             print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoSupplierOrder").'</td></tr>';
         }
         print "</table><br>";
@@ -489,7 +489,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
         else if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) print $langs->trans("BoxTitleLastModifiedProspects",$max);
 		else print $langs->trans("BoxTitleLastModifiedCustomers",$max);
 		print '</th>';
-		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<th align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=p,c">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -510,7 +510,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
 				print '<td align="right" nowrap>'.dol_print_date($db->jdate($objp->tms),'day')."</td>";
 				print '</tr>';
 				$i++;
-				
+
 
 			}
 
@@ -547,8 +547,9 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 		$i = 0;
 
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><th>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</th>';
-		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '<tr class="liste_titre">';
+		print '<th>'.$langs->trans("BoxTitleLastModifiedSuppliers",min($max,$num)).'</th>';
+		print '<th align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/societe/list.php?type=f">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 		if ($num)
 		{
@@ -564,7 +565,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire)
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1,'supplier',44).'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($objp->dm),'day').'</td>';
 				print '</tr>';
-				
+
 				$i++;
 			}
 
@@ -644,7 +645,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) // TO
                 print $companystatic->getNomUrl(1,'customer',44);
 				print '</td>'."\n";
 				print "<td align=\"right\">".$staticcontrat->LibStatut($obj->statut,3)."</td></tr>\n";
-				
+
 				$i++;
 			}
 			print "</table><br>";
@@ -690,7 +691,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
-				
+
 				print '<tr class="oddeven">';
 
 				// Ref
@@ -787,7 +788,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 			while ($i < $nbofloop)
 			{
 				$obj = $db->fetch_object($result);
-				
+
 				print '<tr class="oddeven">';
 
 				// Ref

htdocs/comm/propal/card.php

@@ -808,6 +808,9 @@ if (empty($reshook))
 							$pu_ttc = price($prodcustprice->lines[0]->price_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);
+							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;
 						}
 					}
 				}

htdocs/comm/propal/class/api_proposals.class.php

@@ -493,7 +493,7 @@ class Proposals extends DolibarrApi
 
 		$result = $this->propal->valid(DolibarrApiAccess::$user, $notrigger);
 		if ($result == 0) {
-			throw new RestException(500, 'Error nothing done. May be object is already validated');
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
 			throw new RestException(500, 'Error when validating Commercial Proposal: '.$this->propal->error);
@@ -535,7 +535,7 @@ class Proposals extends DolibarrApi
 
 		$result = $this->propal->cloture(DolibarrApiAccess::$user, $status, $note_private, $notrigger);
 		if ($result == 0) {
-			throw new RestException(500, 'Error nothing done. May be object is already closed');
+			throw new RestException(304, 'Error nothing done. May be object is already closed');
 		}
 		if ($result < 0) {
 			throw new RestException(500, 'Error when closing Commercial Proposal: '.$this->propal->error);

htdocs/comm/propal/class/propal.class.php

@@ -364,42 +364,42 @@ class Propal extends CommonObject
 		}
 	}
 
-	/**
-	 *    	Add a proposal line into database (linked to product/service or not)
-	 *      The parameters are already supposed to be appropriate and with final values to the call
-	 *      of this method. Also, for the VAT rate, it must have already been defined
-	 *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
-	 *      and desc must already have the right value (it's up to the caller to manage multilanguage)
-	 *
-	 * 		@param    	string		$desc				Description de la ligne
-	 * 		@param    	float		$pu_ht				Prix unitaire
-	 * 		@param    	float		$qty             	Quantite
-	 * 		@param    	float		$txtva           	Taux de tva
-	 * 		@param		float		$txlocaltax1		Local tax 1 rate
-	 *  	@param		float		$txlocaltax2		Local tax 2 rate
-	 *		@param    	int			$fk_product      	Id du produit/service predefini
-	 * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
-	 * 		@param    	string		$price_base_type	HT or TTC
-	 * 		@param    	float		$pu_ttc             Prix unitaire TTC
-	 * 		@param    	int			$info_bits			Bits de type de lignes
-	 *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
-	 *      @param      int			$rang               Position of line
-	 *      @param		int			$special_code		Special code (also used by externals modules!)
-	 *      @param		int			$fk_parent_line		Id of parent line
-	 *      @param		int			$fk_fournprice		Id supplier price
-	 *      @param		int			$pa_ht				Buying price without tax
-	 *      @param		string		$label				???
-	 *		@param      int			$date_start       	Start date of the line
-	 *		@param      int			$date_end         	End date of the line
-	 *      @param		array		$array_options		extrafields array
-	 * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
-	 *      @param		string		$origin				'order', ...
-	 *      @param		int			$origin_id			Id of origin object
-	 * 		@param		double		$pu_ht_devise		Unit price in currency
-	 * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
-	 *    	@return    	int         	    			>0 if OK, <0 if KO
-	 *    	@see       	add_product
-	 */
+    /**
+     *    	Add a proposal line into database (linked to product/service or not)
+     *      The parameters are already supposed to be appropriate and with final values to the call
+     *      of this method. Also, for the VAT rate, it must have already been defined
+     *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
+     *      and desc must already have the right value (it's up to the caller to manage multilanguage)
+     *
+     * 		@param    	string		$desc				Description of line
+     * 		@param    	float		$pu_ht				Unit price
+     * 		@param    	float		$qty             	Quantity
+     * 		@param    	float		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
+     * 		@param		float		$txlocaltax1		Local tax 1 rate (deprecated, use instead txtva with code inside)
+     *  	@param		float		$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
+     *		@param    	int			$fk_product      	Id du produit/service predefini
+     * 		@param    	float		$remise_percent  	Pourcentage de remise de la ligne
+     * 		@param    	string		$price_base_type	HT or TTC
+     * 		@param    	float		$pu_ttc             Prix unitaire TTC
+     * 		@param    	int			$info_bits			Bits de type de lignes
+     *      @param      int			$type               Type of line (0=product, 1=service). Not used if fk_product is defined, the type of product is used.
+     *      @param      int			$rang               Position of line
+     *      @param		int			$special_code		Special code (also used by externals modules!)
+     *      @param		int			$fk_parent_line		Id of parent line
+     *      @param		int			$fk_fournprice		Id supplier price
+     *      @param		int			$pa_ht				Buying price without tax
+     *      @param		string		$label				???
+     *		@param      int			$date_start       	Start date of the line
+     *		@param      int			$date_end         	End date of the line
+     *      @param		array		$array_options		extrafields array
+     * 		@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
+     *      @param		string		$origin				'order', ...
+     *      @param		int			$origin_id			Id of origin object
+     * 		@param		double		$pu_ht_devise		Unit price in currency
+     * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
+     *    	@return    	int         	    			>0 if OK, <0 if KO
+     *    	@see       	add_product
+     */
 	function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0, $pu_ht_devise=0, $fk_remise_except=0)
 	{
 		global $mysoc, $conf, $langs;
@@ -1018,11 +1018,15 @@ class Propal extends CommonObject
 							$fk_parent_line = 0;
 						}
 
+                        // Complete vat rate with code
+						$vatrate = $this->lines[$i]->tva_tx;
+						if ($this->lines[$i]->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$this->lines[$i]->vat_src_code.')';
+
 						$result = $this->addline(
 							$this->lines[$i]->desc,
 							$this->lines[$i]->subprice,
 							$this->lines[$i]->qty,
-							$this->lines[$i]->tva_tx,
+							$vatrate,
 							$this->lines[$i]->localtax1_tx,
 							$this->lines[$i]->localtax2_tx,
 							$this->lines[$i]->fk_product,
@@ -1234,7 +1238,6 @@ class Propal extends CommonObject
 		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $clonedObj->ref_client	= '';
 
 		// Create clone
-
 		$result=$clonedObj->create($user);
 		if ($result < 0) $error++;
 		else

htdocs/comm/propal/list.php

@@ -320,12 +320,12 @@ foreach ($search_array_options as $key => $val)
 	$crit=$val;
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
-	$mode=0;
-	if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 	{
-		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
 // Add where from hooks
@@ -400,8 +400,8 @@ if ($resql)
 		'presend'=>$langs->trans("SendByMail"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	if ($user->rights->propal->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	if ($massaction == 'presend') $arrayofmassactions=array();
+	if ($user->rights->propal->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+	if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 	// Lignes des champs de filtre
@@ -417,15 +417,11 @@ if ($resql)
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
-	if ($massaction == 'presend')
-	{
-		$topicmail="SendSupplierProposalRef";
-		$modelmail="supplier_proposal_send";
-		$objecttmp=new Propal($db);
-		$trackid='ord'.$object->id;
-
-		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	}
+	$topicmail="SendProposalRef";
+	$modelmail="proposal_send";
+	$objecttmp=new Propal($db);
+	$trackid='pro'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($sall)
 	{

htdocs/commande/card.php

@@ -761,10 +761,13 @@ if (empty($reshook))
 					{
 						if (count($prodcustprice->lines) > 0)
 						{
-							$pu_ht = price($prodcustprice->lines [0]->price);
-							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
-							$price_base_type = $prodcustprice->lines [0]->price_base_type;
-							$tva_tx = $prodcustprice->lines [0]->tva_tx;
+							$pu_ht = price($prodcustprice->lines[0]->price);
+							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
+							$price_base_type = $prodcustprice->lines[0]->price_base_type;
+							$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;
 						}
 					}
 					else

htdocs/commande/class/api_orders.class.php

@@ -396,16 +396,16 @@ class Orders extends DolibarrApi
      * @return int
      */
     function put($id, $request_data = NULL) {
-      if(! DolibarrApiAccess::$user->rights->commande->creer) {
+      if (! DolibarrApiAccess::$user->rights->commande->creer) {
 		  	throw new RestException(401);
 		  }
 
         $result = $this->commande->fetch($id);
-        if( ! $result ) {
+        if (! $result) {
             throw new RestException(404, 'Order not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+		if (! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
         foreach($request_data as $field => $value) {
@@ -413,7 +413,13 @@ class Orders extends DolibarrApi
             $this->commande->$field = $value;
         }
 
-        if($this->commande->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
+	// Update availability
+	if (!empty($this->commande->availability_id)) {
+	    if ($this->commande->availability($this->commande->availability_id) < 0)
+		throw new RestException(400, 'Error while updating availability');
+	}
+
+        if ($this->commande->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
             return $this->get($id);
 
         return false;
@@ -487,18 +493,22 @@ class Orders extends DolibarrApi
 
 		$result = $this->commande->valid(DolibarrApiAccess::$user, $idwarehouse, $notrigger);
 		if ($result == 0) {
-		    throw new RestException(500, 'Error nothing done. May be object is already validated');
+		    throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
 		    throw new RestException(500, 'Error when validating Order: '.$this->commande->error);
 		}
+	$result = $this->commande->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Order not found');
+        }
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Order validated (Ref='.$this->commande->ref.')'
-            )
-        );
+	if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+       }
+
+        $this->commande->fetchObjectLinked();
+        return $this->_cleanObjectDatas($this->commande);
     }
 
     /**
@@ -527,7 +537,7 @@ class Orders extends DolibarrApi
 
     	$result = $this->commande->cloture(DolibarrApiAccess::$user, $notrigger);
     	if ($result == 0) {
-    		throw new RestException(500, 'Error nothing done. May be object is already closed');
+    		throw new RestException(304, 'Error nothing done. May be object is already closed');
     	}
     	if ($result < 0) {
     		throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
@@ -541,6 +551,51 @@ class Orders extends DolibarrApi
     	);
     }
 
+    /**
+     * Set an order to draft
+     *
+     * @param   int     $id             Order ID
+     * @param   int 	$idwarehouse    Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
+     *
+     * @url POST    {id}/settodraft
+     *
+     * @return  array
+     */
+    function settodraft($id, $idwarehouse=-1)
+    {
+        if(! DolibarrApiAccess::$user->rights->commande->creer) {
+                throw new RestException(401);
+        }
+        $result = $this->commande->fetch($id);
+        if( ! $result ) {
+                throw new RestException(404, 'Order not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+                throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->commande->set_draft(DolibarrApiAccess::$user, $idwarehouse);
+        if ($result == 0) {
+                throw new RestException(304, 'Nothing done. May be object is already closed');
+        }
+        if ($result < 0) {
+                throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
+        }
+
+		$result = $this->commande->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Order not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $this->commande->fetchObjectLinked();
+        return $this->_cleanObjectDatas($this->commande);
+    }
+
 
     /**
      * Clean sensible object datas

htdocs/commande/class/commande.class.php

@@ -416,7 +416,7 @@ class Commande extends CommonOrder
      *	Set draft status
      *
      *	@param	User	$user			Object user that modify
-     *	@param	int		$idwarehouse	Id warehouse to use for stock change.
+     *	@param	int		$idwarehouse	Warehouse ID to use for stock change (Used only if option STOCK_CALCULATE_ON_VALIDATE_ORDER is on)
      *	@return	int						<0 if KO, >0 if OK
      */
     function set_draft($user, $idwarehouse=-1)
@@ -824,11 +824,15 @@ class Commande extends CommonOrder
                         $fk_parent_line = 0;
                     }
 
+					// Complete vat rate with code
+					$vatrate = $line->tva_tx;
+					if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
+
                     $result = $this->addline(
                         $line->desc,
                         $line->subprice,
                         $line->qty,
-                        $line->tva_tx,
+                        $vatrate,
                         $line->localtax1_tx,
                         $line->localtax2_tx,
                         $line->fk_product,
@@ -1215,9 +1219,9 @@ class Commande extends CommonOrder
      *	@param      string			$desc            	Description of line
      *	@param      float			$pu_ht    	        Unit price (without tax)
      *	@param      float			$qty             	Quantite
-     *	@param      float			$txtva           	Taux de tva force, sinon -1
-     *	@param      float			$txlocaltax1		Local tax 1 rate
-     *	@param      float			$txlocaltax2		Local tax 2 rate
+     * 	@param    	float			$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
+     * 	@param		float			$txlocaltax1		Local tax 1 rate (deprecated, use instead txtva with code inside)
+     * 	@param		float			$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
      *	@param      int				$fk_product      	Id of product
      *	@param      float			$remise_percent  	Pourcentage de remise de la ligne
      *	@param      int				$info_bits			Bits de type de lignes

htdocs/commande/index.php

@@ -58,8 +58,7 @@ llxHeader("",$langs->trans("Orders"),$help_url);
 
 print load_fiche_titre($langs->trans("OrdersArea"));
 
-//print '<table width="100%" class="notopnoleftnoright">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
+
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
@@ -141,7 +140,7 @@ if ($resql)
     {
         if (! $conf->use_javascript_ajax)
         {
-            
+
             print '<tr class="oddeven">';
             print '<td>'.$commandestatic->LibStatut($status,$bool,0).'</td>';
             print '<td align="right"><a href="list.php?viewstatut='.$status.'">'.(isset($vals[$status.$bool])?$vals[$status.$bool]:0).' ';
@@ -154,7 +153,6 @@ if ($resql)
         }
     }
     //if ($totalinprocess != $total)
-    //print '<tr class="liste_total"><td>'.$langs->trans("Total").' ('.$langs->trans("CustomersOrdersRunning").')</td><td align="right">'.$totalinprocess.'</td></tr>';
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td align="right">'.$total.'</td></tr>';
     print "</table><br>";
 }
@@ -196,7 +194,7 @@ if (! empty($conf->commande->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				
+
 				$obj = $db->fetch_object($resql);
 
                 $commandestatic->id=$obj->rowid;
@@ -220,7 +218,7 @@ if (! empty($conf->commande->enabled))
 		}
 		else
 		{
-			
+
 			print '<tr class="oddeven"><td colspan="3">'.$langs->trans("NoOrder").'</td></tr>';
 		}
 		print "</table><br>";
@@ -228,7 +226,6 @@ if (! empty($conf->commande->enabled))
 }
 
 
-//print '</td><td valign="top" width="70%" class="notopnoleftnoright">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
@@ -268,7 +265,7 @@ if ($resql)
 		$var = true;
 		while ($i < $num)
 		{
-			
+
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -349,7 +346,7 @@ if (! empty($conf->commande->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				
+
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" width="20%">';
@@ -431,7 +428,7 @@ if (! empty($conf->commande->enabled))
 			$var = true;
 			while ($i < $num)
 			{
-				
+
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 				print '<td width="20%" class="nowrap">';
@@ -479,7 +476,6 @@ if (! empty($conf->commande->enabled))
 }
 
 
-//print '</td></tr></table>';
 print '</div></div></div>';
 
 

htdocs/commande/list.php

@@ -209,224 +209,6 @@ if (empty($reshook))
 	$uploaddir = $conf->commande->dir_output;
 	$trigger_name='ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-
-	// TODO Move this into mass action include
-	if ($massaction == 'confirm_createbills') {
-
-		$orders = GETPOST('toselect','array');
-		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-		$validate_invoices = GETPOST('valdate_invoices', 'int');
-
-		$TFact = array();
-		$TFactThird = array();
-
-		$nb_bills_created = 0;
-
-		$db->begin();
-
-		foreach($orders as $id_order)
-		{
-			$cmd = new Commande($db);
-			if ($cmd->fetch($id_order) <= 0) continue;
-
-			$object = new Facture($db);
-			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
-			else {
-
-				$object->socid = $cmd->socid;
-				$object->type = Facture::TYPE_STANDARD;
-				$object->cond_reglement_id	= $cmd->cond_reglement_id;
-				$object->mode_reglement_id	= $cmd->mode_reglement_id;
-				$object->fk_project			= $cmd->fk_project;
-
-				$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
-				if (empty($datefacture))
-				{
-					$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
-				}
-
-				$object->date = $datefacture;
-				$object->origin    = 'commande';
-				$object->origin_id = $id_order;
-
-				$res = $object->create($user);
-
-				if($res > 0) $nb_bills_created++;
-			}
-
-			if ($object->id > 0)
-			{
-				$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
-				$sql.= "fk_source";
-				$sql.= ", sourcetype";
-				$sql.= ", fk_target";
-				$sql.= ", targettype";
-				$sql.= ") VALUES (";
-				$sql.= $id_order;
-				$sql.= ", '".$object->origin."'";
-				$sql.= ", ".$object->id;
-				$sql.= ", '".$object->element."'";
-				$sql.= ")";
-
-				if (! $db->query($sql))
-				{
-					$error++;
-				}
-
-				if (! $error)
-				{
-					$lines = $cmd->lines;
-					if (empty($lines) && method_exists($cmd, 'fetch_lines'))
-					{
-						$cmd->fetch_lines();
-						$lines = $cmd->lines;
-					}
-
-					$fk_parent_line=0;
-					$num=count($lines);
-
-					for ($i=0;$i<$num;$i++)
-					{
-						$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
-						if ($lines[$i]->subprice < 0)
-						{
-							// Negative line, we create a discount line
-							$discount = new DiscountAbsolute($db);
-							$discount->fk_soc=$object->socid;
-							$discount->amount_ht=abs($lines[$i]->total_ht);
-							$discount->amount_tva=abs($lines[$i]->total_tva);
-							$discount->amount_ttc=abs($lines[$i]->total_ttc);
-							$discount->tva_tx=$lines[$i]->tva_tx;
-							$discount->fk_user=$user->id;
-							$discount->description=$desc;
-							$discountid=$discount->create($user);
-							if ($discountid > 0)
-							{
-								$result=$object->insert_discount($discountid);
-								//$result=$discount->link_to_invoice($lineid,$id);
-							}
-							else
-							{
-								setEventMessages($discount->error, $discount->errors, 'errors');
-								$error++;
-								break;
-							}
-						}
-						else
-						{
-							// Positive line
-							$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
-							// Date start
-							$date_start=false;
-							if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
-							if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
-							if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
-							//Date end
-							$date_end=false;
-							if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
-							if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
-							if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
-							// Reset fk_parent_line for no child products and special product
-							if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
-							{
-								$fk_parent_line = 0;
-							}
-							$result = $object->addline(
-									$desc,
-									$lines[$i]->subprice,
-									$lines[$i]->qty,
-									$lines[$i]->tva_tx,
-									$lines[$i]->localtax1_tx,
-									$lines[$i]->localtax2_tx,
-									$lines[$i]->fk_product,
-									$lines[$i]->remise_percent,
-									$date_start,
-									$date_end,
-									0,
-									$lines[$i]->info_bits,
-									$lines[$i]->fk_remise_except,
-									'HT',
-									0,
-									$product_type,
-									$ii,
-									$lines[$i]->special_code,
-									$object->origin,
-									$lines[$i]->rowid,
-									$fk_parent_line,
-									$lines[$i]->fk_fournprice,
-									$lines[$i]->pa_ht,
-									$lines[$i]->label
-							);
-							if ($result > 0)
-							{
-								$lineid=$result;
-							}
-							else
-							{
-								$lineid=0;
-								$error++;
-								break;
-							}
-							// Defined the new fk_parent_line
-							if ($result > 0 && $lines[$i]->product_type == 9)
-							{
-								$fk_parent_line = $result;
-							}
-						}
-					}
-				}
-			}
-
-			//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
-
-			if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
-			else $TFact[$object->id] = $object;
-		}
-
-		// Build doc with all invoices
-		$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-		$toselect = array();
-
-		if (! $error && $validate_invoices)
-		{
-			$massaction = $action = 'builddoc';
-			foreach($TAllFact as &$object)
-			{
-				$result = $object->validate($user);
-				if ($result <= 0)
-				{
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-					break;
-				}
-
-				$id = $object->id; // For builddoc action
-
-				// Fac builddoc
-				$donotredirect = 1;
-				$upload_dir = $conf->facture->dir_output;
-				$permissioncreate=$user->rights->facture->creer;
-				include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-			}
-
-			$massaction = $action = 'confirm_createbills';
-		}
-
-		if (! $error)
-		{
-			$db->commit();
-			setEventMessage($langs->trans('BillCreated', $nb_bills_created));
-		}
-		else
-		{
-			$db->rollback();
-			$action='create';
-			$_GET["origin"]=$_POST["origin"];
-			$_GET["originid"]=$_POST["originid"];
-			setEventMessages($object->error, $object->errors, 'errors');
-			$error++;
-		}
-	}
 }
 
 
@@ -552,12 +334,12 @@ foreach ($search_array_options as $key => $val)
 	$crit=$val;
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
-	$mode=0;
-	if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 	{
-		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
 // Add where from hooks
@@ -651,8 +433,8 @@ if ($resql)
 		'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	if($user->rights->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-	if ($user->rights->commande->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+	if ($user->rights->commande->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+	if (in_array($massaction, array('presend','predelete','createbills'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 	// Lines of title fields
@@ -669,15 +451,11 @@ if ($resql)
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
-	if ($massaction == 'presend')
-	{
-		$topicmail="SendOrderRef";
-		$modelmail="order_send";
-		$objecttmp=new Commande($db);
-		$trackid='ord'.$object->id;
-
-		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	}
+	$topicmail="SendOrderRef";
+	$modelmail="order_send";
+	$objecttmp=new Commande($db);
+	$trackid='ord'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($massaction == 'createbills')
 	{
@@ -686,7 +464,7 @@ if ($resql)
 
 		print '<table class="noborder" width="100%" >';
 		print '<tr>';
-		print '<td class="titlefieldmiddle">';
+		print '<td class="titlefield">';
 		print $langs->trans('DateInvoice');
 		print '</td>';
 		print '<td>';
@@ -715,6 +493,8 @@ if ($resql)
 		{
 			print $form->selectyesno('valdate_invoices', 0, 1);
 		}
+		if (! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
+		else print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("OptionToSetOrderBilledNotEnabled").'</span>';
 		print '</td>';
 		print '</tr>';
 		print '</table>';

htdocs/compta/bank/bankentries_list.php

@@ -507,13 +507,13 @@ foreach ($search_array_options as $key => $val)
     $crit=$val;
     $tmpkey=preg_replace('/search_options_/','',$key);
     $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-    if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-    if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+	{
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
+	}
 }
 // Add where from hooks
 $parameters=array();
@@ -573,8 +573,8 @@ if ($resql)
         //'presend'=>$langs->trans("SendByMail"),
         //'builddoc'=>$langs->trans("PDFMerge"),
     );
-    //if ($user->rights->bank->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-    if ($massaction == 'presend') $arrayofmassactions=array();
+    //if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+    if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
     $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
     // Confirmation delete

htdocs/compta/bank/card.php

@@ -99,7 +99,7 @@ if ($action == 'add')
 	$object->owner_address   = trim($_POST["owner_address"]);
 
 	$account_number 		 = GETPOST('account_number','alpha');
-	if ($account_number <= 0) { $object->account_number = ''; } else { $object->account_number = $account_number; }
+	if (empty($account_number) || $account_number == '-1') { $object->account_number = ''; } else { $object->account_number = $account_number; }
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal','int');
 	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
 
@@ -627,7 +627,7 @@ else
 		print '<td>';
 		if (! empty($conf->accounting->enabled)) {
 			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch('',$object->account_number);
+			$accountingaccount->fetch('',$object->account_number, 1);
 
 			print $accountingaccount->getNomUrl(0,1,1,'',1);
 		} else {

htdocs/compta/bank/class/api_bankaccounts.class.php

@@ -344,7 +344,7 @@ class BankAccounts extends DolibarrApi
     /**
      * Add a link to an account line
      *
-     * @param int    $account_id    ID of account
+     * @param int    $id    		ID of account
      * @param int    $line_id       ID of account line
      * @param int    $url_id        ID to set in the URL {@from body}
      * @param string $url           URL of the link {@from body}
@@ -352,16 +352,16 @@ class BankAccounts extends DolibarrApi
      * @param string $type          Type of link ('payment', 'company', 'member', ...) {@from body}
      * @return int  ID of link
      *
-     * @url POST {account_id}/lines/{line_id}/links
+     * @url POST {id}/lines/{line_id}/links
      */
-    function addLink($account_id, $line_id, $url_id, $url, $label, $type)
+    function addLink($id, $line_id, $url_id, $url, $label, $type)
     {
         if (! DolibarrApiAccess::$user->rights->banque->modifier) {
             throw new RestException(401);
         }
 
         $account = new Account($this->db);
-        $result = $account->fetch($account_id);
+        $result = $account->fetch($id);
         if (! $result) {
             throw new RestException(404, 'account not found');
         }

htdocs/compta/bank/class/paymentvarious.class.php

@@ -528,14 +528,14 @@ class PaymentVarious extends CommonObject
 		$result='';
         $label=$langs->trans("ShowVariousPayment").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $linkstart = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
-		$picto='payment';
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= ($maxlen?dol_trunc($this->ref,$maxlen):$this->ref);
+		$result .= $linkend;
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
 		return $result;
 	}
 

htdocs/compta/bank/list.php

@@ -164,13 +164,13 @@ foreach ($search_array_options as $key => $val)
     $crit=$val;
     $tmpkey=preg_replace('/search_options_/','',$key);
     $typ=$extrafields->attribute_type[$tmpkey];
-    $mode=0;
-    if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-    if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-    if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
-    {
-        $sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
-    }
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
+	{
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
+	}
 }
 // Add where from hooks
 $parameters=array();
@@ -238,8 +238,8 @@ $arrayofmassactions =  array(
 //    'presend'=>$langs->trans("SendByMail"),
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->banque->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
+if ($user->rights->banque->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton='';
@@ -262,6 +262,11 @@ print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 print_barre_liste($title,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_bank.png',0,$newcardbutton,'',$limit, 1);
 
+$topicmail="Information";
+//$modelmail="subscription";
+$objecttmp=new Account($db);
+//$trackid='sub'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
@@ -414,7 +419,7 @@ if (! empty($arrayfields['accountype']['checked']))       print_liste_field_titr
 if (! empty($arrayfields['b.number']['checked']))         print_liste_field_titre($arrayfields['b.number']['label'],$_SERVER["PHP_SELF"],'b.number','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'],$_SERVER["PHP_SELF"],'b.account_number','',$param,'',$sortfield,$sortorder);
 if (! empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'],$_SERVER["PHP_SELF"],'b.fk_accountancy_journal','',$param,'',$sortfield,$sortorder);
-if (! empty($arrayfields['b.currency_code']['checked']))  print_liste_field_titre($arrayfields['b.currency_code']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
+if (! empty($arrayfields['b.currency_code']['checked']))  print_liste_field_titre($arrayfields['b.currency_code']['label'],$_SERVER["PHP_SELF"],'b.currency_code','',$param,'align="center"',$sortfield,$sortorder);
 if (! empty($arrayfields['toreconcile']['checked']))      print_liste_field_titre($arrayfields['toreconcile']['label'],$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder);
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))

htdocs/compta/bank/various_payment/index.php

@@ -138,7 +138,8 @@ if ($result)
 	if ($typeid) $param.='&typeid='.$typeid;
 	if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
-	print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -168,11 +169,11 @@ if ($result)
 
 	// Ref
 	print '<td class="liste_titre" align="left">';
-	print '<input class="flat" type="text" size="3" name="search_ref" value="'.$search_ref.'">';
+	print '<input class="flat" type="text" size="3" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 
 	// Label
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.$search_label.'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 
 	// Date
 	print '<td class="liste_titre">&nbsp;</td>';
@@ -286,12 +287,12 @@ if ($result)
 
 	$colspan=5;
 	if (! empty($conf->banque->enabled)) $colspan++;
+
 	print '<tr class="liste_total">';
 	print '<td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
 	print '<td class="liste_total" align="right">'.price($totalarray['totaldeb'])."</td>";
 	print '<td class="liste_total" align="right">'.price($totalarray['totalcred'])."</td>";
 	print '<td></td>';
-	print '<td></td>';
 	print '</tr>';
 
 	print "</table>";

htdocs/compta/facture/card.php

@@ -677,7 +677,7 @@ if (empty($reshook))
 		$result=$discountcheck->fetch(0,$object->id);
 
 		$canconvert=0;
-		if ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 1 && empty($discountcheck->id)) $canconvert=1;	// we can convert deposit into discount if deposit is payed completely and not already converted (see real condition into condition used to show button converttoreduc)
+		if ($object->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert=1;	// we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
 		if (($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_STANDARD) && $object->paye == 0 && empty($discountcheck->id)) $canconvert=1;	// we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
 		if ($canconvert)
 		{
@@ -763,17 +763,21 @@ if (empty($reshook))
 
 			if (empty($error))
 			{
-				// Classe facture
-				$result = $object->set_paid($user);
-				if ($result >= 0)
-				{
+				if($object->type != Facture::TYPE_DEPOSIT) {
+					// Classe facture
+					$result = $object->set_paid($user);
+					if ($result >= 0)
+					{
+						$db->commit();
+					}
+					else
+					{
+						setEventMessages($object->error, $object->errors, 'errors');
+						$db->rollback();
+					}
+				} else {
 					$db->commit();
 				}
-				else
-				{
-					setEventMessages($object->error, $object->errors, 'errors');
-					$db->rollback();
-				}
 			}
 			else
 			{
@@ -1132,6 +1136,7 @@ if (empty($reshook))
 								$TTotalByTva = array();
 								foreach ($srcobject->lines as &$line)
 								{
+									if(! empty($line->special_code)) continue;
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc ;
 								}
 
@@ -1654,6 +1659,9 @@ if (empty($reshook))
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$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;
 						}
 					}
 				}
@@ -4258,7 +4266,7 @@ else if ($id > 0 || ! empty($ref))
 					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '&amp;action=converttoreduc">' . $langs->trans('ConvertToReduc') . '</a></div>';
 				}
 				// For deposit invoice
-				if ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $user->rights->facture->creer && empty($discount->id))
+				if ($object->type == Facture::TYPE_DEPOSIT && $user->rights->facture->creer && empty($discount->id))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a></div>';
 				}

htdocs/compta/facture/class/api_invoices.class.php

@@ -653,7 +653,9 @@ class Invoices extends DolibarrApi
 
 
      /**
-     * Add a discount line into an invoice (as an invoice line) using an existing absolute discount (Consume the discount)
+     * Add a discount line into an invoice (as an invoice line) using an existing absolute discount
+     *
+     * Note that this consume the discount.
      *
      * @param int   $id             Id of invoice
      * @param int   $discountid     Id of discount
@@ -696,7 +698,9 @@ class Invoices extends DolibarrApi
     }
 
      /**
-     * Add an available credit note discount to payments of an existing invoice (Consume the credit note)
+     * Add an available credit note discount to payments of an existing invoice.
+     *
+     *  Note that this consume the credit note.
      *
      * @param int   $id            Id of invoice
      * @param int   $discountid    Id of a discount coming from a credit note

htdocs/compta/facture/class/facture-rec.class.php

@@ -6,6 +6,7 @@
  * Copyright (C) 2012       Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2017       Frédéric France         <frederic.france@netlogic.fr>
  *
  * 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
@@ -107,7 +108,8 @@ class FactureRec extends CommonInvoice
 		$this->nb_gen_done=0;
 		$this->nb_gen_max=empty($this->nb_gen_max)?0:$this->nb_gen_max;
 		$this->auto_validate=empty($this->auto_validate)?0:$this->auto_validate;
-
+		$this->generate_pdf = empty($this->generate_pdf)?0:$this->generate_pdf;
+        
 		$this->db->begin();
 
 		// Charge facture modele
@@ -127,6 +129,7 @@ class FactureRec extends CommonInvoice
 			$sql.= ", remise";
 			$sql.= ", note_private";
 			$sql.= ", note_public";
+			$sql.= ", modelpdf";
 			$sql.= ", fk_user_author";
 			$sql.= ", fk_projet";
 			$sql.= ", fk_account";
@@ -140,6 +143,7 @@ class FactureRec extends CommonInvoice
 			$sql.= ", nb_gen_done";
 			$sql.= ", nb_gen_max";
 			$sql.= ", auto_validate";
+			$sql.= ", generate_pdf";
 			$sql.= ") VALUES (";
 			$sql.= "'".$this->db->escape($this->titre)."'";
 			$sql.= ", ".$facsrc->socid;
@@ -149,6 +153,7 @@ class FactureRec extends CommonInvoice
 			$sql.= ", ".(!empty($facsrc->remise)?$this->remise:'0');
 			$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
 			$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
+			$sql.= ", ".(!empty($this->modelpdf)?("'".$this->db->escape($this->modelpdf)."'"):"NULL");
 			$sql.= ", '".$this->db->escape($user->id)."'";
 			$sql.= ", ".(! empty($facsrc->fk_project)?"'".$facsrc->fk_project."'":"null");
 			$sql.= ", ".(! empty($facsrc->fk_account)?"'".$facsrc->fk_account."'":"null");
@@ -162,6 +167,7 @@ class FactureRec extends CommonInvoice
 			$sql.= ", ".$this->nb_gen_done;
 			$sql.= ", ".$this->nb_gen_max;
 			$sql.= ", ".$this->auto_validate;
+			$sql.= ", ".$this->generate_pdf;
 			$sql.= ")";
 
 			if ($this->db->query($sql))
@@ -276,9 +282,11 @@ class FactureRec extends CommonInvoice
 		$sql.= ', f.remise_percent, f.remise_absolue, f.remise';
 		$sql.= ', f.date_lim_reglement as dlr';
 		$sql.= ', f.note_private, f.note_public, f.fk_user_author';
+        $sql.= ', f.modelpdf';
 		$sql.= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet';
 		$sql.= ', f.fk_account';
 		$sql.= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.usenewprice, f.auto_validate';
+        $sql.= ', f.generate_pdf';
 		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql.= ', c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
 		//$sql.= ', el.fk_source';
@@ -336,7 +344,7 @@ class FactureRec extends CommonInvoice
 				$this->note_private           = $obj->note_private;
 				$this->note_public            = $obj->note_public;
 				$this->user_author            = $obj->fk_user_author;
-				$this->modelpdf               = $obj->model_pdf;
+				$this->modelpdf               = $obj->modelpdf;
 				$this->rang					  = $obj->rang;
 				$this->special_code			  = $obj->special_code;
 				$this->frequency			  = $obj->frequency;
@@ -347,7 +355,8 @@ class FactureRec extends CommonInvoice
 				$this->nb_gen_max			  = $obj->nb_gen_max;
 				$this->usenewprice			  = $obj->usenewprice;
 				$this->auto_validate		  = $obj->auto_validate;
-
+				$this->generate_pdf           = $obj->generate_pdf;
+                
 				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
 
 				// Retreive all extrafield for thirdparty
@@ -948,8 +957,18 @@ class FactureRec extends CommonInvoice
     			        $this->errors = $facture->errors;
     			        $this->error = $facture->error;
 			            $error++;
-			        }
+                    }
 			    }
+                if (! $error && $facturerec->generate_pdf)
+                {
+                    $result = $facture->generateDocument($facturerec->modelpdf, $langs);
+                    if ($result <= 0)
+                    {
+                        $this->errors = $facture->errors;
+                        $this->error = $facture->error;
+                        $error++;
+                    }
+                }
 
 				if (! $error && $invoiceidgenerated >= 0)
 				{
@@ -1391,6 +1410,68 @@ class FactureRec extends CommonInvoice
             return -1;
         }
     }
+
+    /**
+     *	Update the auto generate documents
+     *
+     *	@param     	int		$validate		0 no document, 1 to generate document
+     *	@return		int						<0 if KO, >0 if OK
+     */
+    function setGeneratePdf($validate)
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setGeneratePdf was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' SET generate_pdf = '.$validate;
+        $sql.= ' WHERE rowid = '.$this->id;
+
+        dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->generate_pdf = $validate;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *	Update the model for documents
+     *
+     *	@param     	string		$model		model of document generator
+     *	@return		int						<0 if KO, >0 if OK
+     */
+    function setModelPdf($model)
+    {
+        if (! $this->table_element)
+        {
+            dol_syslog(get_class($this)."::setModelPdf was called on objet with property table_element not defined",LOG_ERR);
+            return -1;
+        }
+
+        $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' SET modelpdf = "' . $model . '"';
+        $sql.= ' WHERE rowid = '.$this->id;
+
+        dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
+        if ($this->db->query($sql))
+        {
+            $this->modelpdf = $model;
+            return 1;
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
 }
 
 

htdocs/compta/facture/class/facture.class.php

@@ -583,11 +583,15 @@ class Facture extends CommonInvoice
 							$fk_parent_line = 0;
 						}
 
+						// Complete vat rate with code
+						$vatrate = $line->tva_tx;
+						if ($line->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$line->vat_src_code.')';
+
 						$result = $this->addline(
 							$line->desc,
 							$line->subprice,
 							$line->qty,
-							$line->tva_tx,
+							$vatrate,
 							$line->localtax1_tx,
 							$line->localtax2_tx,
 							$line->fk_product,
@@ -2486,8 +2490,8 @@ class Facture extends CommonInvoice
 	 * 		@param    	double		$pu_ht              Unit price without tax (> 0 even for credit note)
 	 * 		@param    	double		$qty             	Quantity
 	 * 		@param    	double		$txtva           	Force Vat rate, -1 for auto (Can contain the vat_src_code too with syntax '9.9 (CODE)')
-	 * 		@param		double		$txlocaltax1		Local tax 1 rate (deprecated)
-	 *  	@param		double		$txlocaltax2		Local tax 2 rate (deprecated)
+	 * 		@param		double		$txlocaltax1		Local tax 1 rate (deprecated, use instead txtva with code inside)
+	 *  	@param		double		$txlocaltax2		Local tax 2 rate (deprecated, use instead txtva with code inside)
 	 *		@param    	int			$fk_product      	Id of predefined product/service
 	 * 		@param    	double		$remise_percent  	Percent of discount on line
 	 * 		@param    	int	$date_start      	Date start of service

htdocs/compta/facture/fiche-rec.php

@@ -8,6 +8,7 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Alexandre Spangaro   <aspangaro.dolibarr@gmail.com>
  * Copyright (C) 2016      Meziane Sof		<virtualsof@yahoo.fr>
+ * Copyright (C) 2017       Frédéric France         <frederic.france@netlogic.fr>
  *
  * 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
@@ -210,14 +211,15 @@ if (empty($reshook))
 		{
 			$object->titre = GETPOST('titre', 'alpha');
 			$object->note_private = GETPOST('note_private','none');
-			$object->note_public  = GETPOST('note_public','none');
+            $object->note_public  = GETPOST('note_public','none');
+            $object->modelpdf = GETPOST('modelpdf', 'alpha');
 			$object->usenewprice = GETPOST('usenewprice');
 
 			$object->frequency = $frequency;
 			$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
 			$object->nb_gen_max = $nb_gen_max;
 			$object->auto_validate = GETPOST('auto_validate', 'int');
-
+            $object->generate_pdf = GETPOST('generate_pdf', 'int');
 			$object->fk_project = $projectid;
 
 			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
@@ -345,6 +347,16 @@ if (empty($reshook))
 	elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
 	{
 		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
+    }
+    // Set generate pdf
+	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
+	{
+		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
+	}
+    // Set model pdf
+	elseif ($action == 'setmodelpdf' && $user->rights->facture->creer)
+	{
+		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
 	}
 
 	// Delete line
@@ -533,6 +545,9 @@ if (empty($reshook))
 						$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 						$price_base_type = $prodcustprice->lines[0]->price_base_type;
 						$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;
 					}
 				}
 			}
@@ -1040,6 +1055,13 @@ if ($action == 'create')
 			print "</td></tr>";
 		}
 
+        // Model pdf
+        print "<tr><td>".$langs->trans('Model')."</td><td>";
+        include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
+        $list = ModelePDFFactures::liste_modeles($db);
+        print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
+        print "</td></tr>";
+
 		print "</table>";
 
 		dol_fiche_end();
@@ -1075,6 +1097,12 @@ if ($action == 'create')
 		print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
 		print "</td></tr>";
 
+		// Auto generate document
+		print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
+		$select = array('0'=>$langs->trans('DoNotGenerateDoc'),'1'=>$langs->trans('AutoGenerateDoc'));
+		print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
+		print "</td></tr>";
+
 		print "</table>";
 
 		dol_fiche_end();
@@ -1345,6 +1373,34 @@ else
 		print "</td>";
 		print '</tr>';
 
+        // Model pdf
+        $langs->load('banks');
+
+        print '<tr><td class="nowrap">';
+        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+        print $langs->trans('Model');
+        print '<td>';
+        if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
+            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'),1).'</a></td>';
+        print '</tr></table>';
+        print '</td><td colspan="3">';
+        if ($action == 'editmodelpdf')
+        {
+            include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php';
+            $list = array();
+            $models = ModelePDFFactures::liste_modeles($db);
+            foreach ($models as $model) {
+                $list[] = $model . ':' . $model;
+            }
+            $select = 'select;'.implode(',', $list);
+            print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
+        }
+        else
+        {
+            print $object->modelpdf;
+        }
+        print "</td>";
+        print '</tr>';
 
 		// Other attributes
 		$cols = 2;
@@ -1449,12 +1505,25 @@ else
 		else
 			print $langs->trans("StatusOfGeneratedInvoices");
 		print '</td><td>';
-			$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
+		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
 		if ($action == 'auto_validate' || $object->frequency > 0)
 		{
 			print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
 		}
 		print '</td>';
+		// Auto generate documents
+		print '<tr><td>';
+		if ($action == 'generate_pdf' || $object->frequency > 0)
+			print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
+		else
+			print $langs->trans("StatusOfGeneratedDocuments");
+		print '</td><td>';
+			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
+		if ($action == 'generate_pdf' || $object->frequency > 0)
+		{
+			print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer, $select);
+		}
+		print '</td>';
 		print '</tr>';
 
 		print '</table>';

htdocs/compta/facture/list.php

@@ -476,12 +476,12 @@ foreach ($search_array_options as $key => $val)
 	$crit=$val;
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
-	$mode=0;
-	if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 	{
-		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
 // Add where from hooks
@@ -592,10 +592,10 @@ if ($resql)
 		}
 		else
 		{
-		   $arrayofmassactions['delete']=$langs->trans("Delete");
+		   $arrayofmassactions['predelete']=$langs->trans("Delete");
 		}
 	}
-	if ($massaction == 'presend') $arrayofmassactions=array();
+	if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 	$i = 0;
@@ -613,15 +613,11 @@ if ($resql)
 
 	print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy.png', 0, '', '', $limit);
 
-	if ($massaction == 'presend')
-	{
-		$topicmail="SendBillRef";
-		$modelmail="facture_send";
-		$objecttmp=new Facture($db);
-		$trackid='inv'.$object->id;
-
-		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	}
+	$topicmail="SendBillRef";
+	$modelmail="facture_send";
+	$objecttmp=new Facture($db);
+	$trackid='inv'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($sall)
 	{

htdocs/compta/index.php

@@ -107,7 +107,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     	$langs->load("donations");
     	$listofsearchfields['search_donation']=array('text'=>'Donation');
     }
-    
+
     if (count($listofsearchfields))
     {
     	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
@@ -123,7 +123,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     		print '</tr>';
     		$i++;
     	}
-    	print '</table>';	
+    	print '</table>';
     	print '</form>';
     	print '<br>';
     }
@@ -194,7 +194,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '</tr>';
 				$tot_ttc+=$obj->total_ttc;
 				$i++;
-				
+
 			}
 
 			print '<tr class="liste_total"><td align="left">'.$langs->trans("Total").'</td>';
@@ -382,7 +382,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$total_ttc +=  $obj->total_ttc;
 				$total += $obj->total_ht;
 				$totalam +=  $obj->am;
-				
+
 				$i++;
 			}
 		}
@@ -499,7 +499,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 
 	$sql = "SELECT d.rowid, d.lastname, d.firstname, d.societe, d.datedon as date, d.tms as dm, d.amount, d.fk_statut";
 	$sql.= " FROM ".MAIN_DB_PREFIX."don as d";
-	$sql.= " WHERE d.entity = ".$conf->entity;
+	$sql.= " WHERE d.entity IN (".getEntity('donation').")";
 	$sql.= $db->order("d.tms","DESC");
 	$sql.= $db->plimit($max, 0);
 
@@ -514,8 +514,9 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
 		print '<th>'.$langs->trans("BoxTitleLastModifiedDonations",$max).'</th>';
+        print '<th></th>';
         print '<th align="right">'.$langs->trans("AmountTTC").'</th>';
-		print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
+        print '<th align="right">'.$langs->trans("DateModificationShort").'</th>';
         print '<th width="16">&nbsp;</th>';
 		print '</tr>';
 		if ($num)
@@ -527,16 +528,19 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire)
 			while ($i < $num && $i < $max)
 			{
 				$objp = $db->fetch_object($result);
-				
-				print '<tr class="oddeven">';
+
 				$donationstatic->id=$objp->rowid;
+				$donationstatic->ref=$objp->rowid;
 				$donationstatic->lastname=$objp->lastname;
 				$donationstatic->firstname=$objp->firstname;
+
 				$label=$donationstatic->getFullName($langs);
 				if ($objp->societe) $label.=($label?' - ':'').$objp->societe;
-				$donationstatic->ref=$label;
+
+				print '<tr class="oddeven">';
 				print '<td>'.$donationstatic->getNomUrl(1).'</td>';
-                print '<td align="right">'.price($objp->amount).'</td>';
+				print '<td>'.$label.'</td>';
+				print '<td align="right">'.price($objp->amount).'</td>';
 				print '<td align="right">'.dol_print_date($db->jdate($objp->dm),'day').'</td>';
                 print '<td>'.$donationstatic->LibStatut($objp->fk_statut,3).'</td>';
 				print '</tr>';
@@ -594,11 +598,13 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 				while ($i < $num)
 				{
 					$obj = $db->fetch_object($resql);
-					print '<tr class="oddeven">';
+
 					$chargestatic->id=$obj->rowid;
 					$chargestatic->ref=$obj->libelle;
 					$chargestatic->lib=$obj->libelle;
 					$chargestatic->paye=$obj->paye;
+
+					print '<tr class="oddeven">';
 					print '<td>'.$chargestatic->getNomUrl(1).'</td>';
 					print '<td align="center">'.dol_print_date($db->jdate($obj->date_ech),'day').'</td>';
 					print '<td align="right">'.price($obj->amount).'</td>';
@@ -719,7 +725,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
 				//print "x".$tot_ttc."z".$obj->tot_fttc;
 				$tot_tobill += ($obj->total_ttc-$obj->tot_fttc);
 				$i++;
-				
+
 			}
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
@@ -831,7 +837,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$total_ttc +=  $obj->total_ttc;
 				$total += $obj->total_ht;
 				$totalam +=  $obj->am;
-				
+
 				$i++;
 			}
 
@@ -972,7 +978,7 @@ if ($resql)
 	while ($i < $db->num_rows($resql))
 	{
 		$obj = $db->fetch_object($resql);
-		
+
 
 		print "<tr ".$bc[$var]."><td>".dol_print_date($db->jdate($obj->da),"day")."</td>";
 		print '<td><a href="action/card.php">'.$obj->libelle.' '.$obj->label.'</a></td></tr>';

htdocs/compta/resultat/clientfourn.php

@@ -907,7 +907,7 @@ else
 			    $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 			    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 			    $sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity = " . getEntity('c_paiement');
-			    $sql.= " WHERE p.entity = ".getEntity('donation');
+			    $sql.= " WHERE p.entity IN (".getEntity('donation').")";
 			    $sql.= " AND fk_statut >= 2";
 			}
 			if (! empty($date_start) && ! empty($date_end))

htdocs/compta/resultat/index.php

@@ -762,7 +762,7 @@ if (! empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
         $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 		$sql.= " INNER JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id AND c.entity = " . getEntity('c_paiement');
-		$sql.= " WHERE p.entity = ".getEntity('donation');
+		$sql.= " WHERE p.entity IN (".getEntity('donation').")";
    	    $sql.= " AND fk_statut >= 2";
 		if (! empty($date_start) && ! empty($date_end))
 			$sql.= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";

htdocs/compta/salaries/class/paymentsalary.class.php

@@ -500,14 +500,16 @@ class PaymentSalary extends CommonObject
 		$result='';
         $label=$langs->trans("ShowSalaryPayment").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $linkstart = '<a href="'.DOL_URL_ROOT.'/compta/salaries/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		$picto='payment';
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		if ($withpicto != 2) $result.=$link.$this->ref.$linkend;
+		$result .= $linkstart;
+		if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+		if ($withpicto != 2) $result.= $this->ref;
+		$result .= $linkend;
+
 		return $result;
 	}
 

htdocs/compta/sociales/class/chargesociales.class.php

@@ -451,13 +451,14 @@ class ChargeSociales extends CommonObject
 
 
     /**
-     *  Return clicable name (with picto eventually)
-     *
-     *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     * 	@param	int		$maxlen			Longueur max libelle
-     *	@return	string					Chaine avec URL
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *	@param	int		$withpicto		Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     * 	@param	int		$maxlen			Max length of label
+     *  @param	int  	$notooltip		1=Disable tooltip
+     *	@return	string					String with link
      */
-    function getNomUrl($withpicto=0,$maxlen=0)
+    function getNomUrl($withpicto=0, $maxlen=0, $notooltip=0)
     {
         global $langs;
 
@@ -466,12 +467,14 @@ class ChargeSociales extends CommonObject
         if (empty($this->ref)) $this->ref=$this->lib;
         $label = $langs->trans("ShowSocialContribution").': '.$this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+        $linkstart = '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+        $result .= $linkstart;
+        if ($withpicto) $result.=img_object(($notooltip?'':$label), ($this->picto?$this->picto:'generic'), ($notooltip?(($withpicto != 2) ? 'class="paddingright"' : ''):'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip?0:1);
+        if ($withpicto != 2) $result.= ($maxlen?dol_trunc($this->ref,$maxlen):$this->ref);
+        $result .= $linkend;
+
         return $result;
     }
 

htdocs/contact/list.php

@@ -327,12 +327,12 @@ foreach ($search_array_options as $key => $val)
 	$crit=$val;
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
-	$mode=0;
-	if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 	{
-		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
 // Add where from hooks
@@ -420,8 +420,8 @@ $arrayofmassactions =  array(
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-if ($massaction == 'presend') $arrayofmassactions=array();
+if ($user->rights->societe->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
@@ -435,6 +435,12 @@ print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 
 print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit);
 
+$topicmail="Information";
+$modelmail="contact";
+$objecttmp=new Contact($db);
+$trackid='ctc'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
 if ($sall)
 {
 	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);

htdocs/contrat/card.php

@@ -517,6 +517,9 @@ if (empty($reshook))
 							$pu_ttc = price($prodcustprice->lines [0]->price_ttc);
 							$price_base_type = $prodcustprice->lines [0]->price_base_type;
 							$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;
 						}
 					}
 				}
@@ -1087,6 +1090,10 @@ if ($action == 'create')
 			$objectsrc->fetch(GETPOST('originid'));
 			if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines'))  $objectsrc->fetch_lines();
 			$objectsrc->fetch_thirdparty();
+			
+			// Replicate extrafields
+			$objectsrc->fetch_optionals($originid);
+			$object->array_options = $objectsrc->array_options;
 
 			$projectid          = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:'');
 

htdocs/contrat/class/api_contracts.class.php

@@ -346,6 +346,83 @@ class Contracts extends DolibarrApi
       return false;
     }
 
+    /**
+     * Activate a service line of a given contract
+     *
+     * @param int   	$id             Id of contract to activate
+     * @param int   	$lineid         Id of line to activate
+     * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
+     * @param string    $dateend		{@from body}  Date end          {@type timestamp}
+     * @param string    $comment  		{@from body}  Comment
+     *
+     * @url	PUT {id}/lines/{lineid}/activate
+     *
+     * @return object
+     */
+    function activateLine($id, $lineid, $datestart, $dateend = NULL, $comment = NULL) {
+    	if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+    		throw new RestException(401);
+    	}
+
+    	$result = $this->contract->fetch($id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'Contrat not found');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+    	}
+
+    	$updateRes = $this->contract->active_line(DolibarrApiAccess::$user, $lineid, $datestart, $dateend, $comment);
+
+    	if ($updateRes > 0) {
+    		$result = $this->get($id);
+    		unset($result->line);
+    		return $this->_cleanObjectDatas($result);
+    	}
+
+    	return false;
+    }
+
+    /**
+     * Unactivate a service line of a given contract
+     *
+     * @param int   	$id             Id of contract to activate
+     * @param int   	$lineid         Id of line to activate
+     * @param string  	$datestart		{@from body}  Date start        {@type timestamp}
+     * @param string    $comment  		{@from body}  Comment
+     *
+     * @url	PUT {id}/lines/{lineid}/unactivate
+     *
+     * @return object
+     */
+    function unactivateLine($id, $lineid, $datestart, $comment = NULL) {
+    	if(! DolibarrApiAccess::$user->rights->contrat->creer) {
+    		throw new RestException(401);
+    	}
+
+    	$result = $this->contract->fetch($id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'Contrat not found');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('contrat',$this->contract->id)) {
+    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+    	}
+
+    	$request_data = (object) $request_data;
+
+    	$updateRes = $this->contract->close_line(DolibarrApiAccess::$user, $lineid, $datestart, $comment);
+
+    	if ($updateRes > 0) {
+    		$result = $this->get($id);
+    		unset($result->line);
+    		return $this->_cleanObjectDatas($result);
+    	}
+
+    	return false;
+    }
+
     /**
      * Delete a line to given contract
      *
@@ -479,7 +556,7 @@ class Contracts extends DolibarrApi
 
 		$result = $this->contract->validate(DolibarrApiAccess::$user, '', $notrigger);
 		if ($result == 0) {
-		    throw new RestException(500, 'Error nothing done. May be object is already validated');
+		    throw new RestException(304, 'Error nothing done. May be object is already validated');
 		}
 		if ($result < 0) {
 		    throw new RestException(500, 'Error when validating Contract: '.$this->contract->error);
@@ -525,7 +602,7 @@ class Contracts extends DolibarrApi
 
     	$result = $this->contract->closeAll(DolibarrApiAccess::$user, $notrigger);
     	if ($result == 0) {
-    		throw new RestException(500, 'Error nothing done. May be object is already close');
+    		throw new RestException(304, 'Error nothing done. May be object is already close');
     	}
     	if ($result < 0) {
     		throw new RestException(500, 'Error when closing Contract: '.$this->contract->error);

htdocs/contrat/list.php

@@ -273,12 +273,12 @@ foreach ($search_array_options as $key => $val)
 	$crit=$val;
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
-	$mode=0;
-	if (in_array($typ, array('int','double','real'))) $mode=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode=2;    		// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+	$mode_search=0;
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 	{
-		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode);
+		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
 }
 // Add where from hooks
@@ -365,8 +365,8 @@ if ($resql)
 		'presend'=>$langs->trans("SendByMail"),
 		'builddoc'=>$langs->trans("PDFMerge"),
 	);
-	if ($user->rights->contrat->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	if ($massaction == 'presend') $arrayofmassactions=array();
+	if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+	if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 	print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
@@ -380,15 +380,11 @@ if ($resql)
 
 	print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, '', '', $limit);
 
-	if ($massaction == 'presend')
-	{
-		$topicmail="SendContractRef";
-		$modelmail="contract";
-		$objecttmp=new Contrat($db);
-		$trackid='con'.$object->id;
-
-		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	}
+	$topicmail="SendContractRef";
+	$modelmail="contract";
+	$objecttmp=new Contrat($db);
+	$trackid='con'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($sall)
 	{

htdocs/contrat/services_list.php

@@ -253,9 +253,9 @@ foreach ($search_array_options as $key => $val)
 	$tmpkey=preg_replace('/search_options_/','',$key);
 	$typ=$extrafields->attribute_type[$tmpkey];
 	$mode_search=0;
-	if (in_array($typ, array('int','double','real'))) $mode_search=1;    							// Search on a numeric
-	if (in_array($typ, array('sellist')) && $crit != '0' && $crit != '-1') $mode_search=2;    		// Search on a foreign key int
-	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0'))
+	if (in_array($typ, array('int','double','real'))) $mode_search=1;								// Search on a numeric
+	if (in_array($typ, array('sellist','link')) && $crit != '0' && $crit != '-1') $mode_search=2;	// Search on a foreign key int
+	if ($crit != '' && (! in_array($typ, array('select','sellist')) || $crit != '0') && (! in_array($typ, array('link')) || $crit != '-1'))
 	{
 		$sql .= natural_search('ef.'.$tmpkey, $crit, $mode_search);
 	}
@@ -323,8 +323,8 @@ $arrayofmassactions =  array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-//if ($user->rights->contrat->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-//if ($massaction == 'presend') $arrayofmassactions=array();
+//if ($user->rights->contrat->supprimer) $arrayofmassactions['predelete']=$langs->trans("Delete");
+//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" action="'. $_SERVER["PHP_SELF"] .'">';

htdocs/core/actions_massactions.inc.php

@@ -481,6 +481,223 @@ if (! $error && $massaction == 'confirm_presend')
 	}
 }
 
+if ($massaction == 'confirm_createbills')
+{
+	$orders = GETPOST('toselect','array');
+	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+	$validate_invoices = GETPOST('valdate_invoices', 'int');
+
+	$TFact = array();
+	$TFactThird = array();
+
+	$nb_bills_created = 0;
+
+	$db->begin();
+
+	foreach($orders as $id_order)
+	{
+		$cmd = new Commande($db);
+		if ($cmd->fetch($id_order) <= 0) continue;
+
+		$object = new Facture($db);
+		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
+		else {
+
+			$object->socid = $cmd->socid;
+			$object->type = Facture::TYPE_STANDARD;
+			$object->cond_reglement_id	= $cmd->cond_reglement_id;
+			$object->mode_reglement_id	= $cmd->mode_reglement_id;
+			$object->fk_project			= $cmd->fk_project;
+
+			$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+			if (empty($datefacture))
+			{
+				$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+			}
+
+			$object->date = $datefacture;
+			$object->origin    = 'commande';
+			$object->origin_id = $id_order;
+
+			$res = $object->create($user);
+
+			if($res > 0) $nb_bills_created++;
+		}
+
+		if ($object->id > 0)
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
+			$sql.= "fk_source";
+			$sql.= ", sourcetype";
+			$sql.= ", fk_target";
+			$sql.= ", targettype";
+			$sql.= ") VALUES (";
+			$sql.= $id_order;
+			$sql.= ", '".$object->origin."'";
+			$sql.= ", ".$object->id;
+			$sql.= ", '".$object->element."'";
+			$sql.= ")";
+
+			if (! $db->query($sql))
+			{
+				$error++;
+			}
+
+			if (! $error)
+			{
+				$lines = $cmd->lines;
+				if (empty($lines) && method_exists($cmd, 'fetch_lines'))
+				{
+					$cmd->fetch_lines();
+					$lines = $cmd->lines;
+				}
+
+				$fk_parent_line=0;
+				$num=count($lines);
+
+				for ($i=0;$i<$num;$i++)
+				{
+					$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+					if ($lines[$i]->subprice < 0)
+					{
+						// Negative line, we create a discount line
+						$discount = new DiscountAbsolute($db);
+						$discount->fk_soc=$object->socid;
+						$discount->amount_ht=abs($lines[$i]->total_ht);
+						$discount->amount_tva=abs($lines[$i]->total_tva);
+						$discount->amount_ttc=abs($lines[$i]->total_ttc);
+						$discount->tva_tx=$lines[$i]->tva_tx;
+						$discount->fk_user=$user->id;
+						$discount->description=$desc;
+						$discountid=$discount->create($user);
+						if ($discountid > 0)
+						{
+							$result=$object->insert_discount($discountid);
+							//$result=$discount->link_to_invoice($lineid,$id);
+						}
+						else
+						{
+							setEventMessages($discount->error, $discount->errors, 'errors');
+							$error++;
+							break;
+						}
+					}
+					else
+					{
+						// Positive line
+						$product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+						// Date start
+						$date_start=false;
+						if ($lines[$i]->date_debut_prevue) $date_start=$lines[$i]->date_debut_prevue;
+						if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+						if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+						//Date end
+						$date_end=false;
+						if ($lines[$i]->date_fin_prevue) $date_end=$lines[$i]->date_fin_prevue;
+						if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+						if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+						// Reset fk_parent_line for no child products and special product
+						if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9)
+						{
+							$fk_parent_line = 0;
+						}
+						$result = $object->addline(
+							$desc,
+							$lines[$i]->subprice,
+							$lines[$i]->qty,
+							$lines[$i]->tva_tx,
+							$lines[$i]->localtax1_tx,
+							$lines[$i]->localtax2_tx,
+							$lines[$i]->fk_product,
+							$lines[$i]->remise_percent,
+							$date_start,
+							$date_end,
+							0,
+							$lines[$i]->info_bits,
+							$lines[$i]->fk_remise_except,
+							'HT',
+							0,
+							$product_type,
+							$ii,
+							$lines[$i]->special_code,
+							$object->origin,
+							$lines[$i]->rowid,
+							$fk_parent_line,
+							$lines[$i]->fk_fournprice,
+							$lines[$i]->pa_ht,
+							$lines[$i]->label
+							);
+						if ($result > 0)
+						{
+							$lineid=$result;
+						}
+						else
+						{
+							$lineid=0;
+							$error++;
+							break;
+						}
+						// Defined the new fk_parent_line
+						if ($result > 0 && $lines[$i]->product_type == 9)
+						{
+							$fk_parent_line = $result;
+						}
+					}
+				}
+			}
+		}
+
+		//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
+
+		if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
+		else $TFact[$object->id] = $object;
+	}
+
+	// Build doc with all invoices
+	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+	$toselect = array();
+
+	if (! $error && $validate_invoices)
+	{
+		$massaction = $action = 'builddoc';
+		foreach($TAllFact as &$object)
+		{
+			$result = $object->validate($user);
+			if ($result <= 0)
+			{
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				break;
+			}
+
+			$id = $object->id; // For builddoc action
+
+			// Fac builddoc
+			$donotredirect = 1;
+			$upload_dir = $conf->facture->dir_output;
+			$permissioncreate=$user->rights->facture->creer;
+			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+		}
+
+		$massaction = $action = 'confirm_createbills';
+	}
+
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessage($langs->trans('BillCreated', $nb_bills_created));
+	}
+	else
+	{
+		$db->rollback();
+		$action='create';
+		$_GET["origin"]=$_POST["origin"];
+		$_GET["originid"]=$_POST["originid"];
+		setEventMessages($object->error, $object->errors, 'errors');
+		$error++;
+	}
+}
+
 if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search'))
 {
 	if (empty($diroutputmassaction))
@@ -726,8 +943,8 @@ if (! $error && $massaction == 'validate' && $permtocreate)
 	}
 }
 
-// Delete records
-if (! $error && $massaction == 'delete' && $permtodelete)
+// Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before)
+if (! $error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permtodelete)
 {
 	$db->begin();
 

htdocs/core/ajax/ajaxdirpreview.php

@@ -86,7 +86,12 @@ else    // For no ajax call
     $relativepath=$ecmdir->getRelativePath();
     $upload_dir = $rootdirfordoc.'/'.$relativepath;
 }
-if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+
+if (empty($url))
+{
+	if (GETPOSTISSET('website')) $url=DOL_URL_ROOT.'/website/index.php';
+	else $url=DOL_URL_ROOT.'/ecm/index.php';
+}
 
 // Load traductions files
 $langs->loadLangs(array("ecm","companies","other"));
@@ -153,6 +158,8 @@ print '<!-- ajaxdirpreview type='.$type.' -->'."\n";
 //print '<!-- Page called with mode='.dol_escape_htmltag(isset($mode)?$mode:'').' type='.dol_escape_htmltag($type).' module='.dol_escape_htmltag($module).' url='.dol_escape_htmltag($url).' '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 $param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
+if (! empty($website)) $param.='&website='.$website;
+if (! empty($pageid))  $param.='&pageid='.$pageid;
 
 
 // Dir scan
@@ -222,6 +229,12 @@ if ($type == 'directory')
     		$relativepath=GETPOST('file','alpha');
     		if ($relativepath && $relativepath!= '/') $relativepath.='/';
     		$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
+   	    	if (GETPOSTISSET('website'))
+	    	{
+	    		$param.='&file_manager=1';
+	    		if (!preg_match('/website=/',$param)) $param.='&website='.urlencode(GETPOST('website','alpha'));
+	    		if (!preg_match('/pageid=/',$param)) $param.='&pageid='.urlencode(GETPOST('pageid','int'));
+	    	}
     	}
     	else
     	{
@@ -255,28 +268,35 @@ if ($type == 'directory')
 
     	if ($module == 'medias')
     	{
+    		$useinecm = 2;
     		$modulepart='medias';
-        	$perm=($user->rights->websites->creer || $user->rights->emailing->creer);
+        	$perm=($user->rights->website->write || $user->rights->emailing->creer);
+        	$title='none';
     	}
     	else
     	{
+    		$useinecm = 1;
     		$modulepart='ecm';
         	$perm=$user->rights->ecm->upload;
+        	$title='';	// Use default
     	}
 
-		$formfile->list_of_documents($filearray,'',$modulepart,$param,1,$relativepath,$perm,1,$textifempty,$maxlengthname,'',$url);
+    	// When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
+    	// When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath
+    	//var_dump("title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url);
+		$formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm);
     }
 }
 
 
-if ($section)
-{
+//if ($section)
+//{
 	$useajax=1;
 	if (! empty($conf->dol_use_jmobile)) $useajax=0;
 	if (empty($conf->use_javascript_ajax)) $useajax=0;
 	if (! empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax=0;
 
-	$param.=($param?'?':'').(preg_replace('/^&/','',$param));
+	//$param.=($param?'?':'').(preg_replace('/^&/','',$param));
 
 	if ($useajax || $action == 'delete')
 	{
@@ -295,14 +315,14 @@ if ($section)
 
 	if ($useajax)
 	{
-		// Enable jquery handlers on new generated HTML objects
+		// Enable jquery handlers button to delete files
 		print '<script type="text/javascript">'."\n";
 		print 'jQuery(document).ready(function() {'."\n";
-		print 'jQuery(".deletefilelink").click(function(e) { jQuery("#urlfile").val(jQuery(this).attr("rel")); jQuery("#dialog-confirm-deletefile").dialog("open"); return false; });'."\n";
+		print 'jQuery(".deletefilelink").click(function(e) { console.log("We click on button with class deletefilelink"); jQuery("#urlfile").val(jQuery(this).attr("rel")); jQuery("#dialog-confirm-deletefile").dialog("open"); return false; });'."\n";
 		print '});'."\n";
 		print '</script>'."\n";
 	}
-}
+//}
 
 // Close db if mode is not noajax
 if ((! isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();

htdocs/core/ajax/ajaxdirtree.php

@@ -231,24 +231,18 @@ if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	    		}
 
 	    		// Enable jquery handlers on new generated HTML objects
-				print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip -->\n";
+	    		// Because the content is reloaded by ajax call, we must also reenable some jquery hooks
+				print "\n<!-- JS CODE TO ENABLE Tooltips on all object with class classfortooltip (reload into ajaxdirtree) -->\n";
 	    		print '<script type="text/javascript">
 	            	jQuery(document).ready(function () {
 	            		jQuery(".classfortooltip").tooltip({
 							show: { collision: "flipfit", effect:\'toggle\', delay:50 },
-							hide: { effect:\'toggle\', delay: 50 },
+							hide: { delay: 50 }, 	/* If I enable effect:\'toggle\' here, a bug appears: the tooltip is shown when collpasing a new dir if it was shown before */
 							tooltipClass: "mytooltip",
 							content: function () {
 	              				return $(this).prop(\'title\');		/* To force to get title as is */
 	          				}
 	            		});
-
-						/* TODO Remove this. Is replaced with function as 3rd parameter of fileTree */
-	            		jQuery(".fmdirlia").click(function(e) {
-	            			id=jQuery(this).attr(\'id\').substr(12);
-	            			jQuery("#formuserfile_section_dir").val(jQuery(this).attr(\'rel\'));
-	            			jQuery("#formuserfile_section_id").val(id);
-	    				});
 	            	});
 	            	</script>';
 

htdocs/core/ajax/row.php

@@ -63,9 +63,9 @@ if ((isset($_POST['roworder']) && ! empty($_POST['roworder'])) && (isset($_POST[
 	$row->table_element_line = $table_element_line;
 	$row->fk_element = $fk_element;
 	$row->id = $element_id;
-	$row->line_ajaxorder($newrowordertab);
+	$row->line_ajaxorder($newrowordertab);		// This update field rank or position in table table_element_line
 
-	// Reorder line to have position of chilren lines sharing same counter than parent lines
+	// Reorder line to have position of children lines sharing same counter than parent lines
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
 	if (in_array($fk_element,array('fk_facture','fk_propal','fk_commande')))
 	{

htdocs/core/boxes/box_activity.php

@@ -188,6 +188,8 @@ class box_activity extends ModeleBoxes
             include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
             $commandestatic=new Commande($db);
 
+            $langs->load("orders");
+
             $cachedir = DOL_DATA_ROOT.'/commande/temp';
             $filename = '/boxactivity-order'.$fileid;
             $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);

htdocs/core/boxes/box_external_rss.php

@@ -82,7 +82,7 @@ class box_external_rss extends ModeleBoxes
 
 		$keyforparamurl="EXTERNAL_RSS_URLRSS_".$site;
 		$keyforparamtitle="EXTERNAL_RSS_TITLE_".$site;
-		
+
 		// Get RSS feed
 		$url=$conf->global->$keyforparamurl;
 
@@ -106,7 +106,7 @@ class box_external_rss extends ModeleBoxes
                 'text' => $title,
                 'sublink' => $link,
                 'subtext'=>$langs->trans("LastRefreshDate").': '.($rssparser->getLastFetchDate()?dol_print_date($rssparser->getLastFetchDate(),"dayhourtext"):$langs->trans("Unknown")),
-                'subpicto'=>'object_bookmark',
+                'subpicto'=>'help',
             );
 		}
 

htdocs/core/boxes/box_factures_fourn.php

@@ -117,6 +117,7 @@ class box_factures_fourn extends ModeleBoxes
 					$datelimite=$db->jdate($objp->datelimite);
 					$date=$db->jdate($objp->df);
 					$datem=$db->jdate($objp->tms);
+
                     $facturestatic->id = $objp->facid;
                     $facturestatic->ref = $objp->ref;
                     $facturestatic->total_ht = $objp->total_ht;
@@ -124,6 +125,8 @@ class box_factures_fourn extends ModeleBoxes
                     $facturestatic->total_ttc = $objp->total_ttc;
                     $facturestatic->date_echeance = $datelimite;
                     $facturestatic->statut = $objp->fk_statut;
+                    $facturestatic->ref_supplier = $objp->ref_supplier;
+
                     $thirdpartytmp->id = $objp->socid;
                     $thirdpartytmp->name = $objp->name;
                     $thirdpartytmp->fournisseur = 1;

htdocs/core/boxes/box_ficheinter.php

@@ -108,27 +108,25 @@ class box_ficheinter extends ModeleBoxes
 
 					$ficheinterstatic->statut=$objp->fk_statut;
 					$ficheinterstatic->id=$objp->rowid;
+					$ficheinterstatic->ref=$objp->ref;
 
-					$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
-					'logo' => $this->boximg,
-					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
+					$this->info_box_contents[$i][] = array('td' => '',
+					'text' => $ficheinterstatic->getNomUrl(1),
+					'asis' => 1
+					);
 
-					$this->info_box_contents[$i][1] = array('td' => '',
-					'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some interventions have no ref
-					'url' => DOL_URL_ROOT."/fichinter/card.php?id=".$objp->rowid);
-
-					$this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
+					$this->info_box_contents[$i][] = array('td' => 'align="left" width="16"',
 					'logo' => 'company',
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-					$this->info_box_contents[$i][3] = array('td' => '',
+					$this->info_box_contents[$i][] = array('td' => '',
 					'text' => dol_trunc($objp->name,40),
 					'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
 
-					$this->info_box_contents[$i][4] = array('td' => 'class="right"',
+					$this->info_box_contents[$i][] = array('td' => 'class="right"',
 					'text' => dol_print_date($datec,'day'));
 
-					$this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"',
+					$this->info_box_contents[$i][] = array('td' => 'align="right" class="nowrap"',
 					'text' => $ficheinterstatic->getLibStatut(6),
 					'asis'=>1
 					);
@@ -136,20 +134,20 @@ class box_ficheinter extends ModeleBoxes
 					$i++;
 				}
 
-				if ($num==0) $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
+				if ($num==0) $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoRecordedInterventions"));
 
 				$db->free($resql);
 			}
 			else
 			{
-				$this->info_box_contents[0][0] = array(  'td' => '',
+				$this->info_box_contents[0][] = array(  'td' => '',
 				'maxlength'=>500,
 				'text' => ($db->error().' sql='.$sql));
 			}
 		}
 		else
 		{
-			$this->info_box_contents[0][0] = array(
+			$this->info_box_contents[0][] = array(
 			    'td' => 'align="left" class="nohover opacitymedium"',
 			    'text' => $langs->trans("ReadPermissionNotAllowed")
 			);

htdocs/core/boxes/box_members.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2015      Frederic France      <frederic.france@free.fr>
  *
@@ -109,6 +109,7 @@ class box_members extends ModeleBoxes
 					$memberstatic->firstname=$objp->firstname;
 					$memberstatic->id = $objp->rowid;
                     $memberstatic->ref = $objp->rowid;
+                    $memberstatic->company = $objp->company;
 
 					if (! empty($objp->fk_soc)) {
 						$memberstatic->socid = $objp->fk_soc;
@@ -126,7 +127,7 @@ class box_members extends ModeleBoxes
 
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
-                        'text' => $memberstatic->getFullName($langs),
+                        'text' => $memberstatic->company,
                         'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
                     );
 

htdocs/core/boxes/box_project.php

@@ -110,22 +110,18 @@ class box_project extends ModeleBoxes
                 while ($i < min($num, $max)) {
                     $objp = $db->fetch_object($result);
 
-                    $tooltip = $langs->trans('Project') . ': ' . $objp->ref;
-                    $this->info_box_contents[$i][0] = array(
-                        'td' => 'align="left" width="16"',
-                        'logo' => 'object_project'.($objp->public?'pub':''),
-                        'tooltip' => $tooltip,
-                        'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
-                    );
+                    $projectstatic->id = $objp->rowid;
+                    $projectstatic->ref = $objp->ref;
+                    $projectstatic->title = $objp->title;
+                    $projectstatic->public = $objp->public;
 
-                    $this->info_box_contents[$i][1] = array(
+                    $this->info_box_contents[$i][] = array(
                         'td' => '',
-                        'text' => $objp->ref,
-                        'tooltip' => $tooltip,
-                        'url' => DOL_URL_ROOT."/projet/card.php?id=".$objp->rowid,
+                        'text' => $projectstatic->getNomUrl(1),
+                    	'asis' => 1
                     );
 
-                    $this->info_box_contents[$i][2] = array(
+                    $this->info_box_contents[$i][] = array(
                         'td' => '',
                         'text' => $objp->title,
                     );
@@ -137,28 +133,28 @@ class box_project extends ModeleBoxes
 					$resultTask = $db->query($sql);
 					if ($resultTask) {
 						$objTask = $db->fetch_object($resultTask);
-                        $this->info_box_contents[$i][3] = array(
+                        $this->info_box_contents[$i][] = array(
                             'td' => 'class="right"',
                             'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
                         );
 						if ($objTask->nb  > 0)
-                            $this->info_box_contents[$i][4] = array(
+                            $this->info_box_contents[$i][] = array(
                                 'td' => 'class="right"',
                                 'text' => round($objTask->totprogress/$objTask->nb, 0)."%",
                             );
 						else
-							$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+							$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
 						$totalnbTask += $objTask->nb;
 					} else {
-						$this->info_box_contents[$i][3] = array('td' => 'class="right"', 'text' => round(0));
-						$this->info_box_contents[$i][4] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
+						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
 					}
 
 					$i++;
 				}
 				if ($max < $num)
 				{
-				    $this->info_box_contents[$i][0] = array('td' => 'colspan="5"', 'text' => '...');
+				    $this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
 				    $i++;
 				}
 			}
@@ -166,25 +162,20 @@ class box_project extends ModeleBoxes
 
 
 		// Add the sum à the bottom of the boxes
-        $this->info_box_contents[$i][0] = array(
-            'tr' => 'class="liste_total"',
-            'td' => 'align="left" ',
-            'text' => "&nbsp;",
-       );
-        $this->info_box_contents[$i][1] = array(
+        $this->info_box_contents[$i][] = array(
             'td' => '',
             'text' => $langs->trans("Total")."&nbsp;".$textHead,
              'text' => "&nbsp;",
         );
-        $this->info_box_contents[$i][2] = array(
+        $this->info_box_contents[$i][] = array(
             'td' => 'align="right" ',
             'text' => round($num, 0)."&nbsp;".$langs->trans("Projects"),
         );
-        $this->info_box_contents[$i][3] = array(
+        $this->info_box_contents[$i][] = array(
             'td' => 'align="right" ',
             'text' => (($max < $num) ? '' : (round($totalnbTask, 0)."&nbsp;".$langs->trans("Tasks"))),
         );
-        $this->info_box_contents[$i][4] = array(
+        $this->info_box_contents[$i][] = array(
             'td' => '',
             'text' => "&nbsp;",
         );

htdocs/core/boxes/box_services_expired.php

@@ -69,6 +69,8 @@ class box_services_expired extends ModeleBoxes
 
     	$this->max=$max;
 
+    	include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+
     	$now=dol_now();
 
     	$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices",$max));
@@ -77,7 +79,7 @@ class box_services_expired extends ModeleBoxes
     	{
     	    // Select contracts with at least one expired service
 			$sql = "SELECT ";
-    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,";
+    		$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.ref_customer, c.ref_supplier,";
 			$sql.= " s.nom as name, s.rowid as socid,";
 			$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
     		$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
@@ -87,7 +89,7 @@ class box_services_expired extends ModeleBoxes
     		$sql.= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
             if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id;
             if (!$user->rights->societe->client->voir  && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    		$sql.= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, s.nom, s.rowid";
+    		$sql.= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
     		$sql.= " ORDER BY date_line ASC";
     		$sql.= $db->plimit($max, 0);
 
@@ -99,6 +101,7 @@ class box_services_expired extends ModeleBoxes
     			$i = 0;
 
     			$thirdpartytmp = new Societe($this->db);
+    			$contract = new Contrat($this->db);
 
     			while ($i < $num)
     			{
@@ -106,30 +109,33 @@ class box_services_expired extends ModeleBoxes
 
     				$objp = $db->fetch_object($resql);
 
-					$dateline=$db->jdate($objp->date_line);
-					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
-
-    				$this->info_box_contents[$i][0] = array('td' => 'align="left" width="16"',
-    				'logo' => $this->boximg,
-    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
-
-    				$this->info_box_contents[$i][1] = array('td' => '',
-    				'text' => ($objp->ref?$objp->ref:$objp->rowid),	// Some contracts have no ref
-    				'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
-
     				$thirdpartytmp->id = $objp->socid;
     				$thirdpartytmp->name = $objp->name;
 
-    				$this->info_box_contents[$i][2] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone" align="left"',
+    				$contract->id = $objp->rowid;
+    				$contract->ref = $objp->ref;
+    				$contract->statut = $objp->fk_statut;
+    				$contract->ref_customer = $objp->ref_customer;
+    				$contract->ref_supplier = $objp->ref_supplier;
+
+					$dateline=$db->jdate($objp->date_line);
+					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late=img_warning($langs->trans("Late"));
+
+    				$this->info_box_contents[$i][] = array('td' => '',
+    				'text' => $contract->getNomUrl(1),
+    				'asis' => 1
+    				);
+
+    				$this->info_box_contents[$i][] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone" align="left"',
     				'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
     				'asis' => 1
     				);
 
-    				$this->info_box_contents[$i][4] = array('td' => 'align="center"',
+    				$this->info_box_contents[$i][] = array('td' => 'align="center"',
     				'text' => dol_print_date($dateline,'day'),
     				'text2'=> $late);
 
-    				$this->info_box_contents[$i][5] = array('td' => 'class="right"',
+    				$this->info_box_contents[$i][] = array('td' => 'class="right"',
     				'text' => $objp->nb_services);
 
 
@@ -139,14 +145,14 @@ class box_services_expired extends ModeleBoxes
     			if ($num==0)
     			{
     			    $langs->load("contracts");
-    			    $this->info_box_contents[$i][0] = array('td' => 'align="center"','text'=>$langs->trans("NoExpiredServices"));
+    			    $this->info_box_contents[$i][] = array('td' => 'align="center"','text'=>$langs->trans("NoExpiredServices"));
     			}
 
 				$db->free($resql);
     		}
     		else
     		{
-    			$this->info_box_contents[0][0] = array(  'td' => '',
+    			$this->info_box_contents[0][] = array(  'td' => '',
                                                         'maxlength'=>500,
                                                         'text' => ($db->error().' sql='.$sql));
     		}

htdocs/core/boxes/box_supplier_orders.php

@@ -109,28 +109,20 @@ class box_supplier_orders extends ModeleBoxes
                     $objp = $db->fetch_object($result);
                     $date=$db->jdate($objp->date_commande);
 					$datem=$db->jdate($objp->tms);
-                    $thirdpartytmp->id = $objp->socid;
+
+					$supplierorderstatic->id = $objp->id;
+					$supplierorderstatic->ref = $objp->ref;
+
+					$thirdpartytmp->id = $objp->socid;
                     $thirdpartytmp->name = $objp->name;
                     $thirdpartytmp->fournisseur = 1;
                     $thirdpartytmp->code_fournisseur = $objp->code_fournisseur;
                     $thirdpartytmp->logo = $objp->logo;
 
-                    $urlo = DOL_URL_ROOT."/fourn/commande/card.php?id=".$objp->rowid;
-                    $urls = DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid;
-
-                    $tooltip = $langs->trans('SupplierOrder') . ': ' . $objp->ref;
-                    $this->info_box_contents[$line][] = array(
-                        'td' => 'align="left" width="16"',
-                        'logo' => $this->boximg,
-                        'tooltip' => $tooltip,
-                        'url' => $urlo,
-                    );
-
                     $this->info_box_contents[$line][] = array(
                         'td' => '',
-                        'text' => $objp->ref,
-                        'tooltip' => $tooltip,
-                        'url' => $urlo,
+                        'text' => $supplierorderstatic->getNomUrl(1),
+                    	'asis' => 1
                     );
 
                     $this->info_box_contents[$line][] = array(
@@ -158,14 +150,14 @@ class box_supplier_orders extends ModeleBoxes
                 }
 
                 if ($num == 0)
-                    $this->info_box_contents[$line][0] = array(
+                    $this->info_box_contents[$line][] = array(
                         'td' => 'align="center"',
                         'text' => $langs->trans("NoSupplierOrder"),
                     );
 
                 $db->free($result);
             } else {
-                $this->info_box_contents[0][0] = array(
+                $this->info_box_contents[0][] = array(
                     'td' => '',
                     'maxlength'=>500,
                     'text' => ($db->error().' sql='.$sql),
@@ -174,7 +166,7 @@ class box_supplier_orders extends ModeleBoxes
         }
         else
         {
-            $this->info_box_contents[0][0] = array(
+            $this->info_box_contents[0][] = array(
                 'td' => 'align="left" class="nohover opacitymedium"',
                 'text' => $langs->trans("ReadPermissionNotAllowed")
             );

htdocs/core/boxes/modules_boxes.php

@@ -231,6 +231,7 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
             $nblines=count($contents);
 
             $out.= "\n<!-- Box ".get_class($this)." start -->\n";
+            //$out.= '<div class="div-table-responsive-no-min">';		// Does not work on home page. TODO Try to fix this.
             $out.= '<div class="box" id="boxto_'.$this->box_id.'">'."\n";
 
             if (! empty($head['text']) || ! empty($head['sublink']) || ! empty($head['subpicto']) || $nblines)
@@ -360,6 +361,7 @@ class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty"
             if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && ! $nblines) $out.= "<br>\n";
 
             $out.= "</div>\n";
+            //$out.= "</div>\n";
             $out.= "<!-- Box ".get_class($this)." end -->\n\n";
             if (! empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
                 dol_filecache($cachedir, $filename, $out);

htdocs/core/class/commonobject.class.php

@@ -3504,9 +3504,9 @@ abstract class CommonObject
 			// Description
 			print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 
-			if ($this->element == 'supplier_proposal')
+			if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier')
 			{
-				print '<td class="linerefsupplier" align="right"><span id="title_fourn_ref">'.$langs->trans("SupplierProposalRefFourn").'</span></td>';
+				print '<td class="linerefsupplier"><span id="title_fourn_ref">'.$langs->trans("SupplierProposalRefFourn").'</span></td>';
 			}
 
 			// VAT
@@ -3878,9 +3878,10 @@ abstract class CommonObject
 			$this->tpl['description'] = '&nbsp;';
 		}
 
-		// VAT Rate
-		$this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
-		if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
+        // VAT Rate
+        $this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
+        $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
+        if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')';
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
@@ -5620,7 +5621,7 @@ abstract class CommonObject
 			foreach($extrafields->attribute_label as $key=>$label)
 			{
 				if (empty($extrafields->attribute_list[$key])) continue;												// 0 = Never visible field
-				if (($mode == 'create' || $mode == 'edit') && abs($extrafields->attribute_list[$key]) != 1) continue;	// <> -1 and <> 1 = not visible on forms, only on list
+				if (($mode == 'create' || $mode == 'edit') && abs($extrafields->attribute_list[$key]) != 1 && abs($extrafields->attribute_list[$key]) != 3) continue;	// <> -1 and <> 1 and <> 3 = not visible on forms, only on list
 
 				// Load language if required
 				if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
@@ -6173,15 +6174,23 @@ abstract class CommonObject
 			}
 		}
 
-		if (! $error && ! $notrigger) {
+		if (! $error)
+		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+		}
 
-			if (!$notrigger) {
-				// Call triggers
-				$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
+		if (! $error)
+		{
+			$result=$this->insertExtraFields();
+			if ($result < 0) $error++;
+		}
+
+		if (! $error && ! $notrigger)
+		{
+			// Call triggers
+			$result=$this->call_trigger(strtoupper(get_class($this)).'_CREATE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		// Commit or rollback

htdocs/core/class/html.form.class.php

@@ -534,7 +534,7 @@ class Form
 		elseif ($type == 'warning') $img = img_warning($alt);
 		else $img = img_picto($alt, $type);
 
-		return $this->textwithtooltip($text, $htmltext, ($tooltiptrigger?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
+		return $this->textwithtooltip($text, $htmltext, (($tooltiptrigger && ! $img)?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger);
 	}
 
 	/**
@@ -689,18 +689,19 @@ class Form
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite=0;
-						$out.= '<option value="" disabled class="selectoptiondisabledwhite">----------------------</option>';
+						$out.= '<option a value="" disabled class="selectoptiondisabledwhite">----------------------</option>';
 					}
 					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']) )
 					{
 						$foundselected=true;
-						$out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
+						$out.= '<option b value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'" selected>';
 					}
 					else
 					{
-						$out.= '<option value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'">';
+						$out.= '<option c value="'.($usecodeaskey?($usecodeaskey=='code2'?$row['code_iso']:$row['code_iso3']):$row['rowid']).'">';
 					}
-					$out.= dol_trunc($row['label'],$maxlength,'middle');
+					if ($row['label']) $out.= dol_trunc($row['label'],$maxlength,'middle');
+					else $out.= '&nbsp;';
 					if ($row['code_iso']) $out.= ' ('.$row['code_iso'] . ')';
 					$out.= '</option>';
 				}
@@ -1330,7 +1331,7 @@ class Form
 			}
 
 			if ($htmlname != 'none' || $options_only) $out.= '<select class="flat'.($moreclass?' '.$moreclass:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-			if ($showempty == 1) $out.= '<option value="0"'.($selected=='0'?' selected':'').'></option>';
+			if ($showempty == 1) $out.= '<option value="0"'.($selected=='0'?' selected':'').'>&nbsp;</option>';
 			if ($showempty == 2) $out.= '<option value="0"'.($selected=='0'?' selected':'').'>'.$langs->trans("Internal").'</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -3551,9 +3552,10 @@ class Form
 	 * 	   @param  	int			$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
 	 *     @param  	int			$height          	Force height of box
 	 *     @param	int			$width				Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.
+	 *     @param	int			$disableformtag		1=Disable form tag. Can be used if we are already inside a <form> section.
 	 *     @return 	string      	    			HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form
 	 */
-	function formconfirm($page, $title, $question, $action, $formquestion='', $selectedchoice="", $useajax=0, $height=200, $width=500)
+	function formconfirm($page, $title, $question, $action, $formquestion='', $selectedchoice='', $useajax=0, $height=200, $width=500, $disableformtag=0)
 	{
 		global $langs,$conf;
 		global $useglobalvars;
@@ -3782,9 +3784,10 @@ class Form
 		{
 			$formconfirm.= "\n<!-- begin form_confirm page=".$page." -->\n";
 
-			$formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
+			if (empty($disableformtag)) $formconfirm.= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";
+
 			$formconfirm.= '<input type="hidden" name="action" value="'.$action.'">'."\n";
-			$formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
+			if (empty($disableformtag)) $formconfirm.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";
 
 			$formconfirm.= '<table width="100%" class="valid">'."\n";
 
@@ -3810,7 +3813,7 @@ class Form
 
 			$formconfirm.= '</table>'."\n";
 
-			$formconfirm.= "</form>\n";
+			if (empty($disableformtag)) $formconfirm.= "</form>\n";
 			$formconfirm.= '<br>';
 
 			$formconfirm.= "<!-- end form_confirm -->\n";
@@ -5508,7 +5511,7 @@ class Form
 			    		cache: true
 			    	},
 	 				language: select2arrayoflanguage,
-					containerCssClass: \':all:\',					/* Line to add class or origin SELECT propagated to the new <span class="select2-selection...> tag */
+					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */
 				    placeholder: "'.dol_escape_js($placeholder).'",
 			    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
 			    	minimumInputLength: '.$minimumInputLength.',

htdocs/core/class/html.formactions.class.php

@@ -205,12 +205,12 @@ class FormActions
         	print '<div class="div-table-responsive-no-min">';
         	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
         	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Action', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Ref',   0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('By',    0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Type',  0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Title', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('Date',  0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
+        	print getTitleFieldOfList('',      0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
         	print '</tr>';
         	print "\n";
 

htdocs/core/class/html.formcompany.class.php

@@ -582,7 +582,6 @@ class FormCompany
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					$("#search_'.$htmlname.'").change(function() {
-					    console.log("Call runJsCodeForEvent'.$htmlname.'");
 						var obj = '.json_encode($events).';
 						$.each(obj, function(key,values) {
 							if (values.method.length) {
@@ -599,6 +598,7 @@ class FormCompany
 						var method = obj.method;
 						var url = obj.url;
 						var htmlname = obj.htmlname;
+			    		console.log("Run runJsCodeForEvent-'.$htmlname.' from selectCompaniesForNewContact id="+id+" method="+method+" showempty="+showempty+" url="+url+" htmlname="+htmlname);
 						$.getJSON(url,
 							{
 								action: method,
@@ -608,6 +608,7 @@ class FormCompany
 							function(response) {
 								if (response != null)
 								{
+									console.log("Change select#"+htmlname+" with content "+response.value)
 									$.each(obj.params, function(key,action) {
 										if (key.length) {
 											var num = response.num;
@@ -618,7 +619,6 @@ class FormCompany
 											}
 										}
 									});
-						            /* console.log("Change select#"+htmlname+" with content "+response.value) */
 									$("select#" + htmlname).html(response.value);
 								}
 							}

htdocs/core/class/html.formfile.class.php

@@ -615,7 +615,10 @@ class FormFile
 					$modelselected=$arraykeys[0];
 				}
 				$out.= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
-				$out.= ajax_combobox('model');
+				if ($conf->use_javascript_ajax)
+				{
+					$out.= ajax_combobox('model');
+				}
 			}
 			else
 			{
@@ -713,14 +716,14 @@ class FormFile
 
 					// Show file name with link to download
 					$out.= '<td class="tdoverflowmax300">';
-					$tmp = $this->showPreview($file,$modulepart,$relativepath,0,$param);
-					$out.= ($tmp?$tmp.' ':'');
-					$out.= '<a class="documentdownload" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
+					$out.= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param?'&'.$param:'').'"';
 					$mime=dol_mimetype($relativepath,'',0);
 					if (preg_match('/text/',$mime)) $out.= ' target="_blank"';
 					$out.= ' target="_blank">';
-					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.$file["name"];
+					$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]);
+					$out.= $file["name"];
 					$out.= '</a>'."\n";
+					$out.= $this->showPreview($file,$modulepart,$relativepath,0,$param);
 					$out.= '</td>';
 
 					// Show file size
@@ -741,12 +744,11 @@ class FormFile
 							//$out.= '&modulepart='.$modulepart; // TODO obsolete ?
 							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
 							$out.= '">'.img_picto($langs->trans("Delete"), 'delete.png').'</a>';
-							//$out.='</td>';
 						}
 						if ($printer)
 						{
 							//$out.= '<td align="right">';
-							$out.= '&nbsp;<a href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
+							$out.= '<a class="paddingleft" href="'.$urlsource.(strpos($urlsource,'?')?'&amp;':'?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
 							$out.= ($param?'&amp;'.$param:'');
 							$out.= '">'.img_picto($langs->trans("PrintFile", $relativepath),'printer.png').'</a>';
 						}
@@ -841,21 +843,24 @@ class FormFile
 
 		$file_list=dol_dir_list($filedir, 'files', 0, $filterforfilesearch, '\.meta$|\.png$');	// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files)
 
+		//var_dump($file_list);
 		// For ajax treatment
 		$out.= '<!-- html.formfile::getDocumentsLink -->'."\n";
 		if (! empty($file_list))
 		{
 			$out='<dl class="dropdown inline-block">
-    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight').'</a></dt>
+    			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignbottom').'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields" style="display: none;">';
 			$tmpout='';
 
 			// Loop on each file found
+			$found=0;
 			foreach($file_list as $file)
 			{
 				$i++;
 				if ($filter && ! preg_match('/'.$filter.'/i', $file["name"])) continue;	// Discard this. It does not match provided filter.
 
+				$found++;
 				// Define relative path for download link (depends on module)
 				$relativepath=$file["name"];								// Cas general
 				if ($modulesubdir) $relativepath=$modulesubdir."/".$file["name"];	// Cas propal, facture...
@@ -877,21 +882,29 @@ class FormFile
 				if (! empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
 				{
 					$tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
-					if ($tmparray && $tmparray['url']) $tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>'.img_picto('','detail').' '.$langs->trans("Preview").' '.$ext.'</a></li>';
+					if ($tmparray && $tmparray['url'])
+					{
+						$tmpout.= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css']?' class="'.$tmparray['css'].'"':'').($tmparray['mime']?' mime="'.$tmparray['mime'].'"':'').($tmparray['target']?' target="'.$tmparray['target'].'"':'').'>';
+						//$tmpout.= img_picto('','detail');
+						$tmpout.= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
+						$tmpout.= $langs->trans("Preview").' '.$ext.'</a></li>';
+					}
 				}
 
 				// Download
-				$tmpout.= '<li><a class="pictopreview" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
+				$tmpout.= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'"';
 				$mime=dol_mimetype($relativepath,'',0);
 				if (preg_match('/text/',$mime)) $tmpout.= ' target="_blank"';
 				$tmpout.= '>';
-				$tmpout.=img_mime($relativepath, $file["name"]).' ';
+				$tmpout.= img_mime($relativepath, $file["name"]);
 				$tmpout.= $langs->trans("Download").' '.$ext;
 				$tmpout.= '</a></li>'."\n";
 			}
 			$out.=$tmpout;
 			$out.='</ul></div></dd>
     			</dl>';
+
+			if (! $found) $out='';
 		}
 		else
 		{
@@ -914,10 +927,13 @@ class FormFile
 	 * 	@param	 int	$forcedownload		Force to open dialog box "Save As" when clicking on file.
 	 * 	@param	 string	$relativepath		Relative path of docs (autodefined if not provided), relative to module dir, not to MAIN_DATA_ROOT.
 	 * 	@param	 int	$permonobject		Permission on object (so permission to delete or crop document)
-	 * 	@param	 int	$useinecm			Change output for use in ecm module
+	 * 	@param	 int	$useinecm			Change output for use in ecm module:
+	 * 										0: Add a previw link. Show also rename and crop file
+	 * 										1: Add link to edit ECM entry
+	 * 										2: Add rename and crop file
 	 * 	@param	 string	$textifempty		Text to show if filearray is empty ('NoFileFound' if not defined)
 	 *  @param   int	$maxlength          Maximum length of file name shown.
-	 *  @param	 string	$title				Title before list
+	 *  @param	 string	$title				Title before list. Use 'none' to disable title.
 	 *  @param	 string $url				Full url to use for click links ('' = autodetect)
 	 *  @param	 int	$showrelpart		0=Show only filename (default), 1=Show first level 1 dir
 	 *  @param   int    $permtoeditline     Permission to edit document line (You must provide a value, -1 is deprecated and must not be used any more)
@@ -977,7 +993,9 @@ class FormFile
 		}
 		else
 		{
-			$param = (isset($object->id)?'&id='.$object->id:'').$param;
+			if (! preg_match('/&id=/', $param) && isset($object->id)) $param.='&id='.$object->id;
+			$relativepathwihtoutslashend=preg_replace('/\/$/', '', $relativepath);
+			if ($relativepathwihtoutslashend) $param.= '&file='.urlencode($relativepathwihtoutslashend);
 
 			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 			{
@@ -995,7 +1013,7 @@ class FormFile
 			}
 
 			// Show list of existing files
-			if (empty($useinecm)) print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
+			if (empty($useinecm) && $title != 'none') print load_fiche_titre($title?$title:$langs->trans("AttachedFiles"));
 			if (empty($url)) $url=$_SERVER["PHP_SELF"];
 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
@@ -1023,6 +1041,7 @@ class FormFile
 			}
 
 			print '<tr class="liste_titre nodrag nodrop">';
+			//print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
 			print_liste_field_titre('Documents2',$url,"name","",$param,'align="left"',$sortfield,$sortorder);
 			print_liste_field_titre('Size',$url,"size","",$param,'align="right"',$sortfield,$sortorder);
 			print_liste_field_titre('Date',$url,"date","",$param,'align="center"',$sortfield,$sortorder);
@@ -1036,10 +1055,10 @@ class FormFile
 			{
 				completeFileArrayWithDatabaseInfo($filearray, $relativedir);
 
-				/*var_dump($sortfield);
-				var_dump($sortorder);*/
-				if ($sortfield && $sortorder)
+				//var_dump($sortfield.' - '.$sortorder);
+				if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
 				{
+					//var_dump($sortfield);
 					$filearray=dol_sort_array($filearray, $sortfield, $sortorder);
 				}
 				//var_dump($filearray);
@@ -1056,6 +1075,7 @@ class FormFile
 						&& ! preg_match('/\.meta$/i',$file['name']))
 				{
 					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
+					$filepath=$relativepath.$file['name'];
 
 					$editline=0;
 					$nboflines++;
@@ -1065,18 +1085,14 @@ class FormFile
 					print '<tr id="row-'.($filearray[$key]['rowid']>0?$filearray[$key]['rowid']:'-AFTER'.$lastrowid.'POS'.($i+1)).'" '.$bcdd[$var].'>';
 					print '<td class="tdoverflowmax300">';
 
-					$filepath=$relativepath.$file['name'];
-
-					if (! $editline) print $this->showPreview($file,$modulepart,$filepath);
-
+					// Show file name with link to download
 					//print "XX".$file['name'];	//$file['name'] must be utf8
-					print '<a class="paddingleft" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 					if ($forcedownload) print '&attachment=1';
 					if (! empty($object->entity)) print '&entity='.$object->entity;
 					print '&file='.urlencode($filepath);
 					print '">';
-
-					print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
+					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'],0,0).')', 'inline-block valignbottom paddingright');
 					if ($showrelpart == 1) print $relativepath;
 					//print dol_trunc($file['name'],$maxlength,'middle');
 					if (GETPOST('action','aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile')))
@@ -1091,6 +1107,7 @@ class FormFile
 						print $file['name'];
 						print '</a>';
 					}
+					if (! $editline) print $this->showPreview($file, $modulepart, $filepath);
 
 					print "</td>\n";
 
@@ -1122,18 +1139,18 @@ class FormFile
 					{
 						// Delete or view link
 						// ($param must start with &)
-						print '<td class="valignmiddle right"><!-- action on files -->';
-						if ($useinecm)
+						print '<td class="valignmiddle right actionbuttons"><!-- action on files -->';
+						if ($useinecm == 1)
 						{
 							print '<a href="'.DOL_URL_ROOT.'/ecm/docfile.php?urlfile='.urlencode($file['name']).$param.'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_view('default', 0, 'class="paddingrightonly"').'</a>';
 						}
-						else
+						if (! $useinecm || $useinecm == 2)
 						{
 							$newmodulepart=$modulepart;
 							if (in_array($modulepart, array('product','produit','service'))) $newmodulepart='produit|service';
 
 							$disablecrop=1;
-							if (in_array($modulepart, array('product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
+							if (in_array($modulepart, array('societe','product','produit','service','expensereport','holiday','project','user'))) $disablecrop=0;
 
 							if (! $disablecrop && image_format_supported($file['name']) > 0)
 							{
@@ -1146,7 +1163,7 @@ class FormFile
 
 							if ($permtoeditline)
 							{
-								print '<a href="'.(($useinecm && $useajax)?'#':$url.'?action=editfile&urlfile='.urlencode($filepath).$param).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
+								print '<a href="'.(($useinecm == 1)?'#':($url.'?action=editfile&urlfile='.urlencode($filepath).$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default',0,'class="paddingrightonly"').'</a>';
 							}
 						}
 						if ($permonobject)
@@ -1442,10 +1459,10 @@ class FormFile
 				// File
 				print '<td>';
 				//print "XX".$file['name']; //$file['name'] must be utf8
-				print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
+				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 				if ($forcedownload) print '&attachment=1';
 				print '&file='.urlencode($relativefile).'">';
-				print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
+				print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')');
 				print dol_trunc($file['name'],$maxlength,'middle');
 				print '</a>';
 
@@ -1672,7 +1689,11 @@ class FormFile
 			{
 				$out.= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime'])?'':' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target'])?'':' target="'.$urladvancedpreview['target'].'"').'>';
 				//$out.= '<a class="pictopreview">';
-				if (empty($ruleforpicto)) $out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+				if (empty($ruleforpicto))
+				{
+					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
+					$out.='<span class="fa fa-search-plus" style="color: gray"></span>';
+				}
 				else $out.= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
 				$out.= '</a>';
 			}

htdocs/core/class/html.formother.class.php

@@ -1023,7 +1023,11 @@ class FormOther
 			$selectboxlist.=Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
             if (empty($conf->use_javascript_ajax)) $selectboxlist.=' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
             $selectboxlist.='</form>';
-            $selectboxlist.=ajax_combobox("boxcombo");
+            if (! empty($conf->use_javascript_ajax))
+            {
+            	include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+            	$selectboxlist.=ajax_combobox("boxcombo");
+            }
         }
 
         // Javascript code for dynamic actions

htdocs/core/js/lib_foot.js.php

@@ -0,0 +1,145 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/js/lib_foot.js.php
+ * \brief      File that include javascript functions (included if option use_javascript activated)
+ */
+
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');
+if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
+if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
+if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOLOGIN'))         define('NOLOGIN',1);
+if (! defined('NOREQUIREMENU'))   define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREHTML'))   define('NOREQUIREHTML',1);
+if (! defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX','1');
+
+session_cache_limiter(FALSE);
+
+require_once '../../main.inc.php';
+
+// Define javascript type
+top_httphead('text/javascript; charset=UTF-8');
+// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+else header('Cache-Control: no-cache');
+
+//var_dump($conf);
+
+// Wrapper to show tooltips (html or onclick popup)
+if (empty($conf->dol_no_mouse_hover))
+{
+	print "\n/* JS CODE TO ENABLE Tooltips on all object with class classfortooltip */\n";
+	print '
+            	jQuery(document).ready(function () {
+					jQuery(".classfortooltip").tooltip({
+						show: { collision: "flipfit", effect:\'toggle\', delay:50 },
+						hide: { delay: 50 },
+						tooltipClass: "mytooltip",
+						content: function () {
+              				return $(this).prop(\'title\');		/* To force to get title as is */
+          				}
+					});
+            		jQuery(".classfortooltiponclicktext").dialog(
+            			{ closeOnEscape: true, classes: { "ui-dialog": "highlight" },
+						maxHeight: window.innerHeight-60, width: '.($conf->browser->layout == 'phone' ? 400 : 700).',
+						modal: true,
+						autoOpen: false }).css("z-index: 5000");
+            		jQuery(".classfortooltiponclick").click(function () {
+            		    console.log("We click on tooltip for element with dolid="+$(this).attr(\'dolid\'));
+            		    if ($(this).attr(\'dolid\'))
+            		    {
+                            obj=$("#idfortooltiponclick_"+$(this).attr(\'dolid\'));		/* obj is a div component */
+            		        obj.dialog("open");
+							return false;
+            		    }
+            		});
+                });
+           ' . "\n";
+}
+
+// Wrapper to manage dropdown
+if (! defined('JS_JQUERY_DISABLE_DROPDOWN'))
+{
+	print "\n/* JS CODE TO ENABLE dropdown */\n";
+	print '
+                jQuery(document).ready(function () {
+                  $(".dropdown dt a").on(\'click\', function () {
+                  	  console.log("We click on dropdown");
+                      //console.log($(this).parent().parent().find(\'dd ul\'));
+                      $(this).parent().parent().find(\'dd ul\').slideToggle(\'fast\');
+                      // Note: Did not find a way to get exact height (value is update at exit) so i calculate a generic from nb of lines
+                      heigthofcontent = 21 * $(this).parent().parent().find(\'dd div ul li\').length;
+                      if (heigthofcontent > 300) heigthofcontent = 300; // limited by max-height on css .dropdown dd ul
+                      posbottom = $(this).parent().parent().find(\'dd\').offset().top + heigthofcontent + 8;
+                      var scrollBottom = $(window).scrollTop() + $(window).height();
+                      diffoutsidebottom = (posbottom - scrollBottom);
+                      console.log("heigthofcontent="+heigthofcontent+", diffoutsidebottom (posbottom="+posbottom+" - scrollBottom="+scrollBottom+") = "+diffoutsidebottom);
+                      if (diffoutsidebottom > 0)
+                      {
+                            pix = "-"+(diffoutsidebottom+8)+"px";
+                            console.log("We reposition top by "+pix);
+                            $(this).parent().parent().find(\'dd\').css("top", pix);
+                      }
+                      // $(".dropdown dd ul").slideToggle(\'fast\');
+                  });
+                  $(".dropdowncloseonclick").on(\'click\', function () {
+                     console.log("Link has class dropdowncloseonclick, so we close/hide the popup ul");
+                     $(this).parent().parent().hide();
+                  });
+
+                  $(document).bind(\'click\', function (e) {
+                  	  // TODO Use a bind on elements in dropdown only to avoid to bind/code all clicks
+                      var $clicked = $(e.target);
+                      if (!$clicked.parents().hasClass("dropdown")) $(".dropdown dd ul").hide();
+                  });
+                });
+           ';
+}
+
+// Wrapper to manage document_preview
+if ($conf->browser->layout != 'phone')
+{
+	print "\n/* JS CODE TO ENABLE document_preview */\n";
+	print '
+                jQuery(document).ready(function () {
+			        jQuery(".documentpreview").click(function () {
+            		    console.log("We click on preview for element with href="+$(this).attr(\'href\')+" mime="+$(this).attr(\'mime\'));
+            		    document_preview($(this).attr(\'href\'), $(this).attr(\'mime\'), \''.dol_escape_js($langs->transnoentities("Preview")).'\');
+                		return false;
+        			});
+        		});
+           ' . "\n";
+}
+
+print "\n/* JS CODE TO ENABLE reposition management (does not work if a redirect is done after action of submission) */\n";
+print '
+			jQuery(document).ready(function() {
+				/* If page_y set, we set scollbar with it */
+				page_y=getParameterByName(\'page_y\', 0); if (page_y > 0) $(\'html, body\').scrollTop(page_y);
+				/* Set handler to add page_y param on some a href links */
+				jQuery(".reposition").click(function() {
+  	           		var page_y = $(document).scrollTop();
+  	           		this.href=this.href+\'&page_y=\'+page_y;
+  	           		console.log("We click on tag with .reposition class. this.ref is now "+this.href)
+		 		});
+			});'."\n";
+

htdocs/core/js/lib_head.js.php

@@ -875,7 +875,7 @@ function document_preview(file, type, title)
 	if ($.inArray(type, ValidImageTypes) < 0) {
 		var width='85%';
 		var object_width='100%';
-		var height = $( window ).height()*0.90;
+		var height = ($( window ).height() - 60) * 0.90;
 		var object_height='98%';
 
 		show_preview('notimage');

htdocs/core/js/timesheet.js

@@ -113,15 +113,15 @@ function parseTime(timeStr, dt)
 function updateTotal(days,mode)
 {
 	console.log('updateTotal days='+days+' mode='+mode);
-    if(mode=="hours")
+    if (mode=="hours")
     {
         var total = new Date(0);
         total.setHours(0);
         total.setMinutes(0);   
         var nbline = document.getElementById('numberOfLines').value;
-        for (var i=0;i<nbline;i++)
+        for (var i=-1; i<nbline; i++)
         { 
-            var id='timespent['+i+']['+days+']';   
+            var id='timespent['+i+']['+days+']';
             var taskTime= new Date(0);
             var element=document.getElementById(id);
             if(element)
@@ -223,7 +223,7 @@ function updateTotal(days,mode)
     {
         var total =0;
         var nbline = document.getElementById('numberOfLines').value;
-        for (var i=0;i<nbline;i++)
+        for (var i=-1; i<nbline; i++)
         { 
             var id='timespent['+i+']['+days+']';   
             var taskTime= new Date(0);

htdocs/core/lib/agenda.lib.php

@@ -239,7 +239,7 @@ function show_array_actions_to_do($max=5)
 
 	    print '<table class="noborder" width="100%">';
 	    print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastActionsToDo",$max).'</th>';
-		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=todo">'.$langs->trans("FullList").'</a></th>';
+		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=todo">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 
 		$var = true;
@@ -336,7 +336,7 @@ function show_array_last_actions_done($max=5)
 
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("LastDoneTasks",$max).'</th>';
-		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/listactions.php?status=done">'.$langs->trans("FullList").'</a></th>';
+		print '<th colspan="2" align="right"><a class="commonlink" href="'.DOL_URL_ROOT.'/comm/action/list.php?status=done">'.$langs->trans("FullList").'</a></th>';
 		print '</tr>';
 		$var = true;
 		$i = 0;
@@ -514,7 +514,7 @@ function calendars_prepare_head($param)
     $h = 0;
     $head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/comm/action/listactions.php'.($param?'?'.$param:'');
+    $head[$h][0] = DOL_URL_ROOT.'/comm/action/list.php'.($param?'?'.$param:'');
     $head[$h][1] = $langs->trans("ViewList");
     $head[$h][2] = 'cardlist';
     $h++;