Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into

develop_dict

Conflicts:
	htdocs/install/mysql/tables/llx_c_payment_term.sql

ChangeLog

@@ -11,9 +11,10 @@ NEW: complete_head_from_modules() in ldap_prepare_head()
 
 WARNING: 
 
-Following changes may create regression for some external modules, but were necessary to make Dolibarr better:
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * The methode "cloture" on contact were renamed into "closeAll".
-
+* The substitution key for reference of object is now __REF__ whatever is the object (it replaces __ORDERREF__, 
+  __PROPALREF__, ...)
 
 
 ***** ChangeLog for 6.0.0 compared to 5.0.* *****

build/makepack-dolibarrmodule.pl

@@ -3,6 +3,7 @@
 # \file         build/makepack-dolibarrmodule.pl
 # \brief        Package builder (tgz, zip, rpm, deb, exe)
 # \author       (c)2005-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \contributor  (c)2017 Nicolas ZABOURI <info@inovea-conseil.com>
 #----------------------------------------------------------------------------
 
 use Cwd;
@@ -134,7 +135,15 @@ foreach my $PROJECT (@PROJECTLIST) {
 	# Get version $MAJOR, $MINOR and $BUILD
 	print "Version detected for module ".$PROJECT.": ";
 	$result=open(IN,"<".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php");
-	if (! $result) { die "Error: Can't open descriptor file ".$SOURCE."/htdocs/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php for reading.\n"; }
+	$custom=false;
+	if (! $result) { 
+                $result=open(IN,"<".$SOURCE."/htdocs/custom/".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php");
+                if (! $result) {
+                    die "Error: Can't open descriptor file ".$SOURCE."/htdocs/(or /htdocs/custom/)".$PROJECTLC."/core/modules/mod".$PROJECT.".class.php for reading.\n"; 
+                }else{
+                    $custom = true;
+                }
+        }
     while(<IN>)
     {
     	if ($_ =~ /this->version\s*=\s*'([\d\.]+)'/) { $PROJVERSION=$1; break; }
@@ -294,8 +303,11 @@ foreach my $PROJECT (@PROJECTLIST) {
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.old`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf.php.postgres`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/conf/conf*sav*`;
+		    if($custom){
+                        $ret=`cp -r $BUILDROOT/$PROJECTLC/htdocs/custom/* $BUILDROOT/$PROJECTLC/htdocs/.`;
+		    }
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom`;
-	        $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom2`;
+	            $ret=`rm -fr $BUILDROOT/$PROJECTLC/htdocs/custom2`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/test`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/Thumbs.db $BUILDROOT/$PROJECTLC/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/Thumbs.db $BUILDROOT/$PROJECTLC/*/*/*/*/Thumbs.db`;
 		    $ret=`rm -fr $BUILDROOT/$PROJECTLC/CVS* $BUILDROOT/$PROJECTLC/*/CVS* $BUILDROOT/$PROJECTLC/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/CVS* $BUILDROOT/$PROJECTLC/*/*/*/*/*/CVS*`;

htdocs/accountancy/admin/accountmodel.php

@@ -289,7 +289,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
 	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
     }
     if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))
@@ -740,15 +740,6 @@ if ($id)
         print '</td>';
         print "</tr>";
 
-        if ($tabname[$id] == MAIN_DB_PREFIX.'c_email_templates')
-        {
-        	print '<tr><td colspan="8">* '.$langs->trans("AvailableVariables").": ";
-        	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-        	$tmp=FormMail::getAvailableSubstitKey('formemail');
-        	print implode(', ', $tmp);
-        	print '</td></tr>';
-        }
-
         $colspan=count($fieldlist)+3;
         if ($id == 4) $colspan++;
 

htdocs/accountancy/admin/categories_list.php

@@ -185,7 +185,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
 	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
     }
     if (isset($_POST["country"]) && ($_POST["country"] <= 0))

htdocs/accountancy/admin/journals_list.php

@@ -174,7 +174,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
 	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
     }
 

htdocs/accountancy/bookkeeping/listbyaccount.php

@@ -209,7 +209,7 @@ print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"]
 
 $viewflat = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php">' . $langs->trans("ViewFlatList") . '</a>';
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,$viewflat,'',$limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $nbtotalofrecords,'title_accountancy',0,$viewflat,'', $limit);
 
 // Reverse sort order
 if ( preg_match('/^asc/i', $sortorder) )
@@ -315,7 +315,7 @@ while ($i < min($num, $limit))
 
     // Affiche un lien vers la facture client/fournisseur
     $doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br /><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
+    print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>' . $line->label_operation . '</td>' : '<td>' . $line->label_operation . '<br><span style="font-size:0.8em">(' . length_accounta($line->subledger_account) . ')</span></td>';
 
 
 	print '<td align="right">' . ($line->debit ? price($line->debit) :''). '</td>';

htdocs/accountancy/expensereport/list.php

@@ -114,11 +114,11 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 }
 
 // Mass actions
-$objectclass='Skeleton';
+$objectclass='ExpenseReport';
-$objectlabel='Skeleton';
+$objectlabel='ExpenseReport';
-$permtoread = $user->rights->accounting->read;
+$permtoread = $user->rights->expensereport->read;
-$permtodelete = $user->rights->accounting->delete;
+$permtodelete = $user->rights->expensereport->delete;
-$uploaddir = $conf->accounting->dir_output;
+$uploaddir = $conf->expensereport->dir_output;
 include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 if ($massaction == 'ventil') {

htdocs/adherents/cartes/carte.php

@@ -68,6 +68,7 @@ if ((! empty($foruserid) || ! empty($foruserlogin) || ! empty($mode)) && ! $mesg
     $sql.= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
     $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
     $sql.= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
+    $sql.= " AND d.entity IN (".getEntity('adherent').")";
     if (is_numeric($foruserid)) $sql.=" AND d.rowid=".$foruserid;
     if ($foruserlogin) $sql.=" AND d.login='".$db->escape($foruserlogin)."'";
     $sql.= " ORDER BY d.rowid ASC";

htdocs/admin/agenda.php

@@ -165,6 +165,8 @@ if (! empty($triggers))
 		if ($module == 'shipping') $module = 'expedition_bon';
 		if ($module == 'member') $module = 'adherent';
 		if ($module == 'project') $module = 'projet';
+		if ($module == 'proposal_supplier') $module = 'supplier_proposal';
+
 		//print 'module='.$module.'<br>';
 		if (! empty($conf->$module->enabled))
 		{

htdocs/admin/agenda_other.php

@@ -373,11 +373,12 @@ $formactions->select_type_actions($conf->global->AGENDA_DEFAULT_FILTER_TYPE, "AG
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_FILTER_STATUS
+// TODO Remove to use the default generic feature
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
 print '<td align="center">&nbsp;</td>'."\n";
 print '<td align="right">'."\n";
-$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2);
+$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100');
 print '</td></tr>'."\n";
 
 // AGENDA_DEFAULT_VIEW

htdocs/admin/bank.php

@@ -399,7 +399,7 @@ print '</table>';
 
 
 
-print '<br /><br />';
+print '<br><br>';
 
 
 /*

htdocs/admin/compta.php

@@ -162,7 +162,7 @@ foreach ($list as $key)
 
 print "</table>\n";
 
-print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<br><br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 print '</form>';
 
 llxFooter();

htdocs/admin/dict.php

@@ -663,7 +663,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
         /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
 	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br />';
+	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
     }
     if (isset($_POST["country"]) && ($_POST["country"]=='0') && ($id != 2))

htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php

@@ -286,7 +286,7 @@ class PrestaShopWebservice
 	 * $xml = $ws->get(array('resource' => 'orders', 'id' => 1));
 	 *	// Here in $xml, a SimpleXMLElement object you can parse
 	 * foreach ($xml->children()->children() as $attName => $attValue)
-	 * 	echo $attName.' = '.$attValue.'<br />';
+	 * 	echo $attName.' = '.$attValue.'<br>';
 	 * }
 	 * catch (PrestaShopWebserviceException $ex)
 	 * {

htdocs/admin/dolistore/class/dolistore.class.php

@@ -40,41 +40,52 @@ class Dolistore
 
     /**
      * Constructor
-     *
-     * @param array 	$options	Options
      */
-    function __construct($options = array('start' => 0, 'end' => 10, 'per_page' => 50, 'categorie' => 0))
+    function __construct()
     {
         global $conf, $langs;
 
-        $this->start     = $options['start'];
-        $this->end       = $options['end'];
-        $this->per_page  = $options['per_page'];
-        $this->categorie = $options['categorie'];
-        $this->search    = $options['search'];
-
         $this->url       = DOL_URL_ROOT.'/admin/modules.php?mode=marketplace';
         $this->shop_url  = 'https://www.dolistore.com/index.php?controller=product&id_product=';
         $this->vat_rate  = 1.2; // 20% de TVA
         $this->debug_api = false;
 
-        if ($this->end == 0) {
+        $langtmp    = explode('_', $langs->defaultlang);
+        $lang       = $langtmp[0];
+        $lang_array = array('en'=>0, 'fr'=>1, 'es'=>2, 'it'=>3, 'de'=>4);	// Into table ps_lang of Prestashop - 1
+        if (! in_array($lang, array_keys($lang_array))) $lang = 'en';
+        $this->lang = $lang_array[$lang];
+    }
+
+    /**
+     * Load data from remote Dolistore market place.
+     * This fills ->categories
+     *
+     * @param 	array 	$options	Options
+     * @return	void
+     */
+    function getRemoteData($options = array('start' => 0, 'end' => 10, 'per_page' => 50, 'categorie' => 0))
+    {
+        global $conf, $langs;
+
+    	$this->start     = $options['start'];
+        $this->end       = $options['end'];
+        $this->per_page  = $options['per_page'];
+        $this->categorie = $options['categorie'];
+        $this->search    = $options['search'];
+
+    	if ($this->end == 0) {
             $this->end = $this->per_page;
         }
 
-        $langtmp    = explode('_', $langs->defaultlang);
+    	try {
-        $lang       = $langtmp[0];
-        $lang_array = array('fr'=>1, 'en'=>2, 'es'=>3, 'it'=>4, 'de'=>5);
-        if (! in_array($lang, array_keys($lang_array))) $lang = 'en';
-        $this->lang = $lang_array[$lang]; // 1=fr 2=en ...
-
-        try {
             $this->api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV,
                 $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $this->debug_api);
 
             // Here we set the option array for the Webservice : we want products resources
             $opt             = array();
             $opt['resource'] = 'products';
+
             // make a search to limit the id returned.
             if ($this->search != '') {
                 $opt2        = array();
@@ -102,7 +113,9 @@ class Dolistore
             $opt['sort']           = 'id_desc';
             $opt['filter[active]'] = '[1]';
             $opt['limit']          = "$this->start,$this->end";
-            // Call
+			// $opt['filter[id]'] contais list of product id that are result of search
+
+            // Call API to get the detail
             $xml                   = $this->api->get($opt);
             $this->products        = $xml->products->children();
 
@@ -124,7 +137,12 @@ class Dolistore
         }
     }
 
-
+	/**
+	 * Return tree of Dolistore categories. $this->categories must have been loaded before.
+	 *
+	 * @param 	int			$parent		Id of parent category
+	 * @return 	string
+	 */
     function get_categories($parent = 0)
     {
     	if (!isset($this->categories)) die('not possible');

htdocs/admin/loan.php

@@ -120,7 +120,7 @@ print '</tr>';
 print '</form>';
 print "</table>\n";
 
-print '<br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
+print '<br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
 llxFooter();
 $db->close();

htdocs/admin/modules.php

@@ -55,7 +55,7 @@ $options['categorie'] = ((GETPOST('categorie', 'int')?GETPOST('categorie', 'int'
 $options['start']     = ((GETPOST('start', 'int')?GETPOST('start', 'int'):0) + 0);
 $options['end']       = ((GETPOST('end', 'int')?GETPOST('end', 'int'):0) + 0);
 $options['search']    = GETPOST('search_keyword', 'alpha');
-$dolistore            = new Dolistore($options);
+$dolistore            = new Dolistore();
 
 
 if (! $user->admin)
@@ -832,6 +832,10 @@ if ($mode == 'marketplace')
 
     if (empty($conf->global->MAIN_DISABLE_DOLISTORE_SEARCH) && $conf->global->MAIN_FEATURES_LEVEL >= 1)
     {
+    	// $options is array with filter criterias
+    	//var_dump($options);
+    	$dolistore->getRemoteData($options);
+
 	    print '<span class="opacitymedium">'.$langs->trans('DOLISTOREdescriptionLong').'</span><br><br>';
 
 	    $previouslink = $dolistore->get_previous_link();

htdocs/admin/multicurrency.php

@@ -235,7 +235,7 @@ print '</td></tr>';
 */
 
 print '</table>';
-print '<br />';
+print '<br>';
 
 if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 {
@@ -293,7 +293,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
 	print '</td></tr>';
 
 	print '</table>';
-	print '<br />';
+	print '<br>';
 }
 
 

htdocs/admin/payment.php

@@ -233,7 +233,7 @@ foreach ($dirmodels as $reldir)
 
 print '</table>';
 
-print "<br />";
+print "<br>";
 
 print load_fiche_titre($langs->trans("OtherOptions"),'','');
 

htdocs/admin/stock.php

@@ -433,7 +433,7 @@ if ($virtualdiffersfromphysical)
 }
 
 
-print '<br />';
+print '<br>';
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 {
 	print '<table class="noborder" width="100%">';

htdocs/api/index.php

@@ -37,6 +37,10 @@ if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not lo
 if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
 
 
+// Force entity if a value provided int HTTP header. Otherwise, will use the entity of user of token used.
+if (! empty($_SERVER['HTTP_DOLAPIENTITY'])) define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
+
+
 $res=0;
 if (! $res && file_exists("../main.inc.php")) $res=include '../main.inc.php';
 if (! $res) die("Include of main fails");

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

@@ -851,7 +851,8 @@ class ActionComm extends CommonObject
     }
 
     /**
-     *   Load all objects with filters
+     *   Load all objects with filters.
+     *   WARNING: This make a fetch on all records instead of making one request with a join.
      *
      *   @param		DoliDb	$db				Database handler
      *   @param		int		$socid			Filter by thirdparty
@@ -863,7 +864,7 @@ class ActionComm extends CommonObject
      *   @param		string	$limit			Limit number of answers
      *   @return	array or string			Error string if KO, array with actions if OK
      */
-    static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='', $sortfield='datep', $sortorder='DESC', $limit=0)
+    static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filter='', $sortfield='a.datep', $sortorder='DESC', $limit=0)
     {
         global $conf, $langs;
 
@@ -880,7 +881,7 @@ class ActionComm extends CommonObject
         }
         if (! empty($filter)) $sql.= $filter;
 		if ($sortorder && $sortfield) $sql.=$db->order($sortfield, $sortorder);
-		if ($limit) $sql.=$db->plimit($limit);
+		$sql.=$db->plimit($limit, 0);
 
         dol_syslog(get_class()."::getActions", LOG_DEBUG);
         $resql=$db->query($sql);

htdocs/comm/action/listactions.php

@@ -371,6 +371,7 @@ if ($resql)
 
 	print '<tr class="liste_titre_filter">';
 	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"></td>';
 	print '<td class="liste_titre" align="center">';
@@ -382,7 +383,6 @@ if ($resql)
 	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"></td>';
     print '<td class="liste_titre center">';
     print $formactions->form_select_status_action('formaction',$status,1,'status',1,2);
     print '</td>';
@@ -395,7 +395,8 @@ if ($resql)
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"a.id",$param,"","",$sortfield,$sortorder);
-	print_liste_field_titre("Title",$_SERVER["PHP_SELF"],"a.label",$param,"","",$sortfield,$sortorder);
+    print_liste_field_titre("ActionsOwnedByShort",$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
+	print_liste_field_titre("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("DateStart",$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder);
@@ -403,7 +404,6 @@ if ($resql)
 	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("ActionsOwnedByShort",$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder);
 	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="center"',$sortfield,$sortorder);
 	print_liste_field_titre("");
 	print "</tr>\n";
@@ -437,13 +437,23 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 
-		// Action (type)
+		// Ref
 		print '<td>';
 		print $actionstatic->getNomUrl(1,-1);
 		print '</td>';
 
-		// Action (type)
+		// User owner
-		print '<td>';
+		print '<td class="tdoverflowmax100">';
+		if ($obj->fk_user_action > 0)
+		{
+			$userstatic->fetch($obj->fk_user_action);
+			print $userstatic->getNomUrl(-1);
+		}
+		else print '&nbsp;';
+		print '</td>';
+
+		// Label
+		print '<td class="tdoverflowmax300">';
 		print $actionstatic->label;
 		print '</td>';
 
@@ -482,7 +492,7 @@ if ($resql)
 		print '</td>';
 
 		// Third party
-		print '<td>';
+		print '<td class="tdoverflowmax100">';
 		if ($obj->socid)
 		{
 			$societestatic->id=$obj->socid;
@@ -520,16 +530,6 @@ if ($resql)
             print '</td>';
         }
 
-		// User owner
-		print '<td align="left">';
-		if ($obj->fk_user_action > 0)
-		{
-			$userstatic->fetch($obj->fk_user_action);
-			print $userstatic->getNomUrl(-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>';

htdocs/comm/mailing/card.php

@@ -1224,7 +1224,6 @@ else
 			// Print mail content
 			print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic');
 
-
 			dol_fiche_head(null, '', '', -1);
 
 			print '<table class="border" width="100%">';

htdocs/comm/mailing/cibles.php

@@ -425,7 +425,7 @@ if ($object->fetch($id) >= 0)
 		if ($allowaddtarget) {
 		    $cleartext=$langs->trans("ToClearAllRecipientsClickHere").' '.'<a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition">'.$langs->trans("TargetsReset").'</a>';
 		}
-		print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$cleartext,$num,$nbtotalofrecords,'title_generic',0,'','',$limit);
+		print_barre_liste($langs->trans("MailSelectedRecipients"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,$cleartext,$num,$nbtotalofrecords,'title_generic',0,'','', $limit);
 
 		print '</form>';
 

htdocs/comm/propal/card.php

@@ -125,7 +125,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) $action = '';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
@@ -611,7 +619,7 @@ if (empty($reshook))
 			// prevent browser refresh from closing proposal several times
 			if ($object->statut == Propal::STATUS_VALIDATED)
 			{
-				$result=$object->cloture($user, GETPOST('statut'), GETPOST('note'));
+				$result=$object->cloture($user, GETPOST('statut','int'), GETPOST('note_private','alpha'));
 				if ($result < 0)
 				{
 					setEventMessages($object->error, $object->errors, 'errors');
@@ -638,16 +646,10 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-
-	/*
-	 * Send mail
-	 */
-
 	// Actions to send emails
     $actiontypecode='AC_OTH_AUTO';
 	$trigger_name='PROPAL_SENTBYMAIL';
-	$paramname='id';
+	$autocopy='MAIN_MAIL_AUTOCOPY_PROPOSAL_TO';
-	$mode='emailfromproposal';
 	$trackid='pro'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
@@ -1686,6 +1688,18 @@ if ($action == 'create')
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ClonePropal'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
+	if ($action == 'statut')
+	{
+		//Form to close proposal (signed or not)
+		$formquestion = array(
+				array('type' => 'select','name' => 'statut','label' => $langs->trans("CloseAs"),'values' => array(2=>$object->labelstatut [2],3=>$object->labelstatut [3])),
+				//array('type' => 'other','name' => 'note_private', 'label' => $langs->trans("Note"),'value' => '<textarea cols="30" rows="' . ROWS_3 . '" wrap="soft" name="note_private" id="note_private">'.$object->note_private.'</textarea>'));
+				array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"),'value' => $object->note_private));
+
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('SetAcceptedRefused'), '', 'setstatut', $formquestion, '', 1, 250);
+
+	}
+
 	// Confirm delete
 	else if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteProp'), $langs->trans('ConfirmDeleteProp', $object->ref), 'confirm_delete', '', 0, 1);
@@ -2213,35 +2227,6 @@ if ($action == 'create')
 
 	dol_fiche_end();
 
-	if ($action == 'statut')
-	{
-		/*
-		 * Form to close proposal (signed or not)
-		 */
-		$form_close = '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
-		$form_close .= '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
-		$form_close .= '<table class="border" width="100%">';
-		$form_close .= '<tr><td width="150"  align="left">' . $langs->trans("CloseAs") . '</td><td align="left">';
-		$form_close .= '<input type="hidden" name="action" value="setstatut">';
-		$form_close .= '<select id="statut" name="statut" class="flat">';
-		$form_close .= '<option value="0">&nbsp;</option>';
-		$form_close .= '<option value="2">' . $object->labelstatut [2] . '</option>';
-		$form_close .= '<option value="3">' . $object->labelstatut [3] . '</option>';
-		$form_close .= '</select>';
-		$form_close .= '</td></tr>';
-		$form_close .= '<tr><td width="150" align="left">' . $langs->trans('Note') . '</td><td align="left"><textarea cols="70" rows="' . ROWS_3 . '" wrap="soft" name="note">';
-		$form_close .= $object->note;
-		$form_close .= '</textarea></td></tr>';
-		$form_close .= '<tr><td align="center" colspan="2">';
-		$form_close .= '<input type="submit" class="button" name="validate" value="' . $langs->trans('Save') . '">';
-		$form_close .= ' &nbsp; <input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '">';
-		$form_close .= '<a name="close">&nbsp;</a>';
-		$form_close .= '</td>';
-		$form_close .= '</tr></table></form>';
-
-		print $form_close;
-	}
-
 	/*
 	 * Boutons Actions
 	 */
@@ -2253,7 +2238,7 @@ if ($action == 'create')
 		                                                                                               // modified by hook
 		if (empty($reshook))
 		{
-			if ($action != 'statut' && $action != 'editline')
+			if ($action != 'editline')
 			{
 				// Validate
 				if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)
@@ -2378,123 +2363,13 @@ if ($action == 'create')
 		print '</div></div></div>';
 	}
 
-	/*
+	// Presend form
-	 * Action presend
+	$modelmail='propal_send';
- 	 */
+	$defaulttopic='SendPropalRef';
-	if ($action == 'presend')
+	$diroutput = $conf->propal->dir_output;
-	{
+	$trackid = 'pro'.$object->id;
-		$object->fetch_projet();
 
-		$ref = dol_sanitizeFileName($object->ref);
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->propal->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendPropalByMail'));
-
-		dol_fiche_head('');
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='pro'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'pro'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-			$liste [$key] = $value;
-		$formmail->withto = GETPOST("sendto") ? GETPOST("sendto") : $liste;
-		$formmail->withtocc = $liste;
-		$formmail->withtoccc = (! empty($conf->global->MAIN_EMAIL_USECCC) ? $conf->global->MAIN_EMAIL_USECCC : false);
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendPropalRef', '__PROPREF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->trans('SendPropalRef', '__PROPREF__ (__REFCLIENT__)');
-		}
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit['__PROPREF__'] = $object->ref; // For backward compatibility
-
-		// Find the good contact adress
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0) {
-			foreach ($contactarr as $contact) {
-				if ($contact ['libelle'] == $langs->trans('TypeContact_propal_external_CUSTOMER')) {	// TODO Use code and not label
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action'] = 'send';
-		$formmail->param['models'] = 'propal_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['id'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
 }
 
 // End of page

htdocs/comm/propal/list.php

@@ -96,8 +96,8 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='p.ref';
 if (! $sortorder) $sortorder='DESC';
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+// Initialize technical object to manage context to save list fields
-$contextpage='proposallist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'proposallist';
 
 // Security check
 $module='propal';
@@ -238,7 +238,7 @@ llxHeader('',$langs->trans('Proposal'),$help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' p.rowid, p.note_private, p.total_ht, p.tva as total_vat, p.total as total_ttc, p.localtax1, p.localtax2, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
@@ -413,105 +413,18 @@ if ($resql)
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
 	if ($massaction == 'presend')
 	{
-	    $langs->load("mails");
-
-	    if (! GETPOST('cancel','alpha'))
-	    {
-	        $objecttmp=new Propal($db);
-	        $listofselectedid=array();
-	        $listofselectedthirdparties=array();
-	        $listofselectedref=array();
-	        foreach($arrayofselected as $toselectid)
-	        {
-	            $result=$objecttmp->fetch($toselectid);
-	            if ($result > 0)
-	            {
-	                $listofselectedid[$toselectid]=$toselectid;
-	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
-	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
-	            }
-	        }
-	    }
-
-	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-
-	    dol_fiche_head(null, '', '');
-
 	    $topicmail="SendSupplierProposalRef";
 	    $modelmail="supplier_proposal_send";
+	    $objecttmp=new Propal($db);
+	    $trackid='ord'.$object->id;
 
-	    // Cree l'objet formulaire mail
+	    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-	    $formmail->withform=-1;
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
-	    {
-	        $formmail->trackid='ord'.$object->id;
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-	    {
-	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-	    }
-	    $formmail->withfrom=1;
-	    $liste=$langs->trans("AllRecipientSelected");
-	    if (count($listofselectedthirdparties) == 1)
-	    {
-	        $liste=array();
-	        $thirdpartyid=array_shift($listofselectedthirdparties);
-	        $soc=new Societe($db);
-	        $soc->fetch($thirdpartyid);
-	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-	        {
-	            $liste[$key]=$value;
-	        }
-	        $formmail->withtoreadonly=0;
-	    }
-	    else
-	    {
-	        $formmail->withtoreadonly=1;
-	    }
-	    $formmail->withto=$liste;
-	    $formmail->withtofree=0;
-	    $formmail->withtocc=1;
-	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-	    $formmail->withbody=1;
-	    $formmail->withdeliveryreceipt=1;
-	    $formmail->withcancel=1;
-	    // Tableau des substitutions
-	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
-	    $formmail->substit['__SIGNATURE__']=$user->signature;
-	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
-	    $formmail->substit['__PERSONALIZED__']='';
-	    $formmail->substit['__CONTACTCIVNAME__']='';
-
-	    // Tableau des parametres complementaires du post
-	    $formmail->param['action']=$action;
-	    $formmail->param['models']=$modelmail;
-	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
-	    $formmail->param['id']=join(',',$arrayofselected);
-	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-	    print $formmail->get_form();
-
-	    dol_fiche_end();
 	}
 
 	if ($sall)
@@ -813,6 +726,7 @@ if ($resql)
 		$companystatic->name=$obj->name;
 		$companystatic->client=$obj->client;
 		$companystatic->code_client=$obj->code_client;
+		$companystatic->email=$obj->email;
 
 		// Thirdparty
 		if (! empty($arrayfields['s.nom']['checked']))

htdocs/commande/card.php

@@ -118,16 +118,11 @@ if (empty($reshook))
 {
 	if ($cancel)
 	{
-		if ($action != 'addlink' && $action != 'updateline')
+		if (! empty($backtopage))
 		{
-			$urltogo=$backtopage?$backtopage:dol_buildpath('/commande/list.php',1);
+			header("Location: ".$backtopage);
-			header("Location: ".$urltogo);
 			exit;
 		}
-		if ($id > 0 || ! empty($ref)) {
-		    $ret = $object->fetch($id,$ref);
-		    $object->fetch_thirdparty();
-        }
 		$action='';
 	}
 
@@ -1256,13 +1251,13 @@ if (empty($reshook))
 		exit();
 	}
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
-
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
 	$trigger_name='ORDER_SENTBYMAIL';
 	$paramname='id';
-	$mode='emailfromorder';
+	$autocopy='MAIN_MAIL_AUTOCOPY_ORDER_TO';		// used to know the automatic BCC to add
 	$trackid='ord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
@@ -2596,134 +2591,13 @@ if ($action == 'create' && $user->rights->commande->creer)
 			print '</div></div></div>';
 		}
 
-		/*
+		// Presend form
-		 * Action presend
+		$modelmail='order_send';
-		 */
+		$defaulttopic='SendOrderRef';
-		if ($action == 'presend')
+		$diroutput = $conf->commande->dir_output;
-		{
+		$trackid = 'ord'.$object->id;
-			$object->fetch_projet();
 
-			$ref = dol_sanitizeFileName($object->ref);
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-			include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-			$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-
-			// Define output language
-			$outputlangs = $langs;
-			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-				$newlang = $object->thirdparty->default_lang;
-
-			if (!empty($newlang))
-			{
-				$outputlangs = new Translate('', $conf);
-				$outputlangs->setDefaultLang($newlang);
-				$outputlangs->load('commercial');
-			}
-
-			// Show email form
-
-			// By default if $action=='presend'
-			$titreform='SendOrderByMail';
-			$topicmail='';
-			if (empty($object->ref_client)) {
-			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__');
-			} else if (! empty($object->ref_client)) {
-			    $topicmail = $outputlangs->trans('SendOrderRef', '__ORDERREF__ (__REFCLIENT__)');
-			}
-			$action='send';
-			$modelmail='order_send';
-
-			// Build document if it not exists
-			if (! $file || ! is_readable($file)) {
-				$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result <= 0) {
-					dol_print_error($db, $object->error, $object->errors);
-					exit();
-				}
-				$fileparams = dol_most_recent_file($conf->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-				$file = $fileparams['fullname'];
-			}
-
-			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-			print '<div class="clearboth"></div>';
-			print '<br>';
-			print load_fiche_titre($langs->trans($titreform));
-
-			dol_fiche_head('');
-
-			// Cree l'objet formulaire mail
-			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-			$formmail = new FormMail($db);
-			$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-            $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-            if($formmail->fromtype === 'user'){
-                $formmail->fromid = $user->id;
-
-            }
-			$formmail->trackid='ord'.$object->id;
-			if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-			{
-				include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-				$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-			}
-			$formmail->withfrom = 1;
-			$liste = array();
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value)
-				$liste [$key] = $value;
-			$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
-			$formmail->withtocc = $liste;
-			$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-			$formmail->withtopic = $topicmail;
-			$formmail->withfile = 2;
-			$formmail->withbody = 1;
-			$formmail->withdeliveryreceipt = 1;
-			$formmail->withcancel = 1;
-			// Tableau des substitutions
-			$formmail->setSubstitFromObject($object);
-			$formmail->substit ['__ORDERREF__'] = $object->ref;
-
-			$custcontact = '';
-			$contactarr = array();
-			$contactarr = $object->liste_contact(- 1, 'external');
-
-			if (is_array($contactarr) && count($contactarr) > 0)
-			{
-				foreach ($contactarr as $contact)
-				{
-					if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
-						$contactstatic = new Contact($db);
-						$contactstatic->fetch($contact ['id']);
-						$custcontact = $contactstatic->getFullName($langs, 1);
-					}
-				}
-
-				if (! empty($custcontact)) {
-					$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-				}
-			}
-
-			// Tableau des parametres complementaires
-			$formmail->param['action'] = $action;
-			$formmail->param['models'] = $modelmail;
-			$formmail->param['models_id']=GETPOST('modelmailselected','int');
-			$formmail->param['orderid'] = $object->id;
-			$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-			// Init list of files
-			if (GETPOST("mode") == 'init') {
-				$formmail->clear_attached_files();
-				$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-			}
-
-			// Show form
-			print $formmail->get_form();
-
-			dol_fiche_end();
-		}
 	}
 }
 

htdocs/commande/list.php

@@ -42,6 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 $langs->loadLangs(array("orders",'sendings','deliveries','companies','compta','bills'));
 
@@ -82,6 +83,7 @@ $result = restrictedArea($user, 'commande', $id,'');
 
 $diroutputmassaction=$conf->commande->dir_output . '/temp/massgeneration/'.$user->id;
 
+// Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
 $sortorder = GETPOST("sortorder",'alpha');
@@ -118,7 +120,8 @@ $checkedtypetiers=0;
 $arrayfields=array(
     'c.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
     'c.ref_client'=>array('label'=>$langs->trans("RefCustomerOrder"), 'checked'=>1),
-    's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
+    'p.project_ref'=>array('label'=>$langs->trans("ProjectRef"), 'checked'=>0, 'enabled'=>1),
+	's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
     's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
     's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
     'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
@@ -186,6 +189,7 @@ if (empty($reshook))
     	$search_deliveryday='';
     	$search_deliverymonth='';
         $search_deliveryyear='';
+        $search_project_ref='';
         $viewstatut='';
         $billed='';
         $toselect='';
@@ -203,7 +207,8 @@ if (empty($reshook))
     $permtoread = $user->rights->commande->lire;
     $permtodelete = $user->rights->commande->supprimer;
     $uploaddir = $conf->commande->dir_output;
-	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    $trigger_name='ORDER_SENTBYMAIL';
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// TODO Move this into mass action include
     if ($massaction == 'confirm_createbills') {
@@ -438,6 +443,7 @@ $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $companystatic = new Societe($db);
 $formcompany=new FormCompany($db);
+$projectstatic=new Project($db);
 
 $title=$langs->trans("Orders");
 $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
@@ -445,12 +451,13 @@ llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0) $sql = 'SELECT DISTINCT';
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name,";
 $sql.= ' c.rowid, c.ref, c.total_ht, c.tva as total_tva, c.total_ttc, c.ref_client,';
 $sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,';
-$sql.= ' c.date_creation as date_creation, c.tms as date_update';
+$sql.= ' c.date_creation as date_creation, c.tms as date_update,';
+$sql.= " p.rowid as project_id, p.ref as project_ref";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -465,6 +472,7 @@ $sql.= ', '.MAIN_DB_PREFIX.'commande as c';
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
 if ($sall || $search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
 if ($search_product_category > 0) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
 if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 if ($search_user > 0)
@@ -539,6 +547,7 @@ if ($search_company) $sql .= natural_search('s.nom', $search_company);
 if ($search_sale > 0) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$search_sale;
 if ($search_user > 0) $sql.= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
 if ($search_total_ht != '') $sql.= natural_search('c.total_ht', $search_total_ht, 1);
+if ($search_project_ref != '') $sql.= natural_search("p.ref",$search_project_ref);
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -626,7 +635,8 @@ if ($resql)
 	if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht;
 	if ($search_total_vat != '') $param.='&search_total_vat='.$search_total_vat;
 	if ($search_total_ttc != '') $param.='&search_total_ttc='.$search_total_ttc;
-    if ($show_files)            $param.='&show_files=' .$show_files;
+	if ($search_project_ref >= 0)  	$param.="&search_project_ref=".$search_project_ref;
+	if ($show_files)            $param.='&show_files=' .$show_files;
     if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 	if ($billed != '')			$param.='&billed='.$billed;
 	// Add $param from extra fields
@@ -661,102 +671,17 @@ if ($resql)
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
-	// TODO Move this into an invluce
 	if ($massaction == 'presend')
 	{
-	    $langs->load("mails");
+		$topicmail="SendOrderRef";
+		$modelmail="order_send";
+		$objecttmp=new Commande($db);
+		$trackid='ord'.$object->id;
 
-	    if (! GETPOST('cancel','alpha'))
+		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	    {
-	        $objecttmp=new Commande($db);
-	        $listofselectedid=array();
-	        $listofselectedthirdparties=array();
-	        $listofselectedref=array();
-	        foreach($arrayofselected as $toselectid)
-	        {
-	            $result=$objecttmp->fetch($toselectid);
-	            if ($result > 0)
-	            {
-	                $listofselectedid[$toselectid]=$toselectid;
-	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
-	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
-	            }
-	        }
-	    }
-
-	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-	    dol_fiche_head(null, '', '');
-
-	    $topicmail="SendOrderRef";
-	    $modelmail="order_send";
-
-	    // Cree l'objet formulaire mail
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-	    $formmail->withform=-1;
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
-	    {
-	        $formmail->trackid='ord'.$object->id;
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-	    {
-	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-	    }
-	    $formmail->withfrom=1;
-	    $liste=$langs->trans("AllRecipientSelected");
-	    if (count($listofselectedthirdparties) == 1)
-	    {
-	        $liste=array();
-	        $thirdpartyid=array_shift($listofselectedthirdparties);
-	        $soc=new Societe($db);
-	        $soc->fetch($thirdpartyid);
-	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-	        {
-	            $liste[$key]=$value;
-	        }
-	        $formmail->withtoreadonly=0;
-	    }
-	    else
-	    {
-	        $formmail->withtoreadonly=1;
-	    }
-	    $formmail->withto=$liste;
-	    $formmail->withtofree=0;
-	    $formmail->withtocc=1;
-	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-	    $formmail->withbody=1;
-	    $formmail->withdeliveryreceipt=1;
-	    $formmail->withcancel=1;
-	    // Tableau des substitutions
-	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
-	    $formmail->substit['__SIGNATURE__']=$user->signature;
-	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
-	    $formmail->substit['__PERSONALIZED__']='';
-	    $formmail->substit['__CONTACTCIVNAME__']='';
-
-	    // Tableau des parametres complementaires du post
-	    $formmail->param['action']=$action;
-	    $formmail->param['models']=$modelmail;
-	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
-	    $formmail->param['id']=join(',',$arrayofselected);
-	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-	    print $formmail->get_form();
-
-	    dol_fiche_end();
 	}
-	elseif ($massaction == 'createbills')
+
+	if ($massaction == 'createbills')
 	{
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createbills">';
@@ -873,6 +798,11 @@ if ($resql)
     	print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.$search_ref_customer.'">';
     	print '</td>';
 	}
+	// Project ref
+	if (! empty($arrayfields['p.project_ref']['checked']))
+	{
+		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';
+	}
 	// Thirpdarty
 	if (! empty($arrayfields['s.nom']['checked']))
 	{
@@ -1016,6 +946,7 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	if (! empty($arrayfields['c.ref']['checked']))            print_liste_field_titre($arrayfields['c.ref']['label'],$_SERVER["PHP_SELF"],'c.ref','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['c.ref_client']['checked']))     print_liste_field_titre($arrayfields['c.ref_client']['label'],$_SERVER["PHP_SELF"],'c.ref_client','',$param,'',$sortfield,$sortorder);
+	if (! empty($arrayfields['p.project_ref']['checked'])) 	  print_liste_field_titre($arrayfields['p.project_ref']['label'],$_SERVER["PHP_SELF"],"p.ref","",$param,'',$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['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder);
 	if (! empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder);
@@ -1065,27 +996,35 @@ if ($resql)
     {
         $obj = $db->fetch_object($resql);
 
-        print '<tr class="oddeven">';
-
         $notshippable=0;
         $warning = 0;
         $text_info='';
         $text_warning='';
         $nbprod=0;
 
+        $companystatic->id=$obj->socid;
+        $companystatic->code_client = $obj->code_client;
+        $companystatic->name=$obj->name;
+        $companystatic->client=$obj->client;
+        $companystatic->email=$obj->email;
+
+        $generic_commande->id=$obj->rowid;
+        $generic_commande->ref=$obj->ref;
+        $generic_commande->statut = $obj->fk_statut;
+        $generic_commande->date_commande = $db->jdate($obj->date_commande);
+        $generic_commande->date_livraison = $db->jdate($obj->date_delivery);
+        $generic_commande->ref_client = $obj->ref_client;
+        $generic_commande->total_ht = $obj->total_ht;
+        $generic_commande->total_tva = $obj->total_tva;
+        $generic_commande->total_ttc = $obj->total_ttc;
+
+        print '<tr class="oddeven">';
+
         // Ref
         if (! empty($arrayfields['c.ref']['checked']))
         {
             print '<td class="nowrap">';
-            $generic_commande->id=$obj->rowid;
+
-            $generic_commande->ref=$obj->ref;
-    	    $generic_commande->statut = $obj->fk_statut;
-    	    $generic_commande->date_commande = $db->jdate($obj->date_commande);
-    	    $generic_commande->date_livraison = $db->jdate($obj->date_delivery);
-            $generic_commande->ref_client = $obj->ref_client;
-            $generic_commande->total_ht = $obj->total_ht;
-            $generic_commande->total_tva = $obj->total_tva;
-            $generic_commande->total_ttc = $obj->total_ttc;
             $generic_commande->lines=array();
             $generic_commande->getLinesArray();
 
@@ -1230,10 +1169,16 @@ if ($resql)
     		if (! $i) $totalarray['nbfield']++;
 		}
 
-		$companystatic->id=$obj->socid;
+		// Project
-        $companystatic->code_client = $obj->code_client;
+		if (! empty($arrayfields['p.project_ref']['checked']))
-		$companystatic->name=$obj->name;
+		{
-		$companystatic->client=$obj->client;
+			$projectstatic->id=$obj->project_id;
+			$projectstatic->ref=$obj->project_ref;
+			print '<td>';
+			if ($obj->project_id > 0) print $projectstatic->getNomUrl(1);
+			print '</td>';
+			if (! $i) $totalarray['nbfield']++;
+		}
 
 		// Third party
 		if (! empty($arrayfields['s.nom']['checked']))

htdocs/compta/bank/card.php

@@ -145,7 +145,7 @@ if ($action == 'add')
         if ($id > 0)
         {
             // Category association
-            $categories = GETPOST('categories');
+            $categories = GETPOST('categories', 'array');
             $object->setCategories($categories);
 
             $_GET["id"]=$id;            // Force chargement page en mode visu
@@ -239,7 +239,7 @@ if ($action == 'update')
         if ($result >= 0)
         {
             // Category association
-            $categories = GETPOST('categories');
+            $categories = GETPOST('categories', 'array');
             $object->setCategories($categories);
 
             $_GET["id"]=$_POST["id"];   // Force chargement page en mode visu

htdocs/compta/bank/class/account.class.php

@@ -1256,6 +1256,7 @@ class Account extends CommonObject
         $label = '<u>' . $langs->trans("ShowAccount") . '</u>';
         $label .= '<br><b>' . $langs->trans('BankAccount') . ':</b> ' . $this->label;
         $label .= '<br><b>' . $langs->trans('AccountNumber') . ':</b> ' . $this->number;
+        $label .= '<br><b>' . $langs->trans("AccountCurrency") . ':</b> ' . $this->currency_code;
         if (! empty($conf->accounting->enabled))
         {
             include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';

htdocs/compta/facture/card.php

@@ -132,7 +132,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel) $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
@@ -1961,20 +1969,17 @@ if (empty($reshook))
 		exit();
 	}
 
-
+	// Actions when printing a doc from card
-	/*
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-	 * Send mail
-	 */
 
 	// Actions to send emails
 	if (empty($id)) $id=$facid;
 	$trigger_name='BILL_SENTBYMAIL';
 	$paramname='id';
-	$mode='emailfrominvoice';
+	$autocopy='MAIN_MAIL_AUTOCOPY_INVOICE_TO';
 	$trackid='inv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-
     // Actions to build doc
     $upload_dir = $conf->facture->dir_output;
     $permissioncreate=$user->rights->facture->creer;
@@ -2007,8 +2012,6 @@ if (empty($reshook))
 			$action = 'edit_extras';
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->facture->creer) {
 		if ($action == 'addcontact') {
 			$result = $object->fetch($id);
@@ -4340,143 +4343,15 @@ else if ($id > 0 || ! empty($ref))
 
 		print '</div></div></div>';
 	}
-	else
-	{
-		/*
-		 * Action presend (or prerelance)
-		 */
 
-		$object->fetch_projet();
 
-		// By default if $action=='presend'
+	// Presend form
-		$titreform = 'SendBillByMail';
+	$modelmail='facture_send';
-		$topicmail = 'SendBillRef';
+	$defaulttopic='SendBillRef';
-		$modelmail = 'facture_send';
+	$diroutput = $conf->facture->dir_output;
+	$trackid = 'inv'.$object->id;
 
-		if ($action == 'prerelance') 		// For backward compatibility
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-		{
-			$titrefrom = 'SendReminderBillByMail';
-			$topicmail = 'SendReminderBillRef';
-			$modelmail = 'facture_relance';
-			$action = 'relance';
-		} else
-			$action = 'send';
-
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file = $fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('bills');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file)) {
-			$result = $object->generateDocument(GETPOST('model','alpha') ? GETPOST('model','alpha') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0) {
-				dol_print_error($db, $object->error, $object->errors);
-				exit();
-			}
-			$fileparams = dol_most_recent_file($conf->facture->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file = $fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans($titreform));
-
-		// Cree l'objet formulaire mail
-		dol_fiche_head();
-
-		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype','alpha')?GETPOST('fromtype','alpha'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='inv'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'inv'.$object->id);
-		}
-		$formmail->withfrom = 1;
-		$liste = array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
-			$liste [$key] = $value;
-		}
-		$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste; // List suggested for send to
-		$formmail->withtocc = $liste; // List suggested for CC
-		$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
-		if (empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->transnoentities($topicmail, '__REF__');
-		} else if (! empty($object->ref_client)) {
-			$formmail->withtopic = $outputlangs->transnoentities($topicmail, '__REF__ (__REFCLIENT__)');
-		}
-
-		$formmail->withfile = 2;
-		$formmail->withbody = 1;
-		$formmail->withdeliveryreceipt = 1;
-		$formmail->withcancel = 1;
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object, $outputlangs);
-		$formmail->substit['__INVREF__'] = $object->ref;
-
-		// Find the good contact adress
-		$custcontact = '';
-		$contactarr = array();
-		$contactarr = $object->liste_contact(- 1, 'external');
-
-		if (is_array($contactarr) && count($contactarr) > 0) {
-			foreach ($contactarr as $contact) {
-				if ($contact['libelle'] == $langs->trans('TypeContact_facture_external_BILLING')) {	// TODO Use code and not label
-
-					require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-
-					$contactstatic = new Contact($db);
-					$contactstatic->fetch($contact ['id']);
-					$custcontact = $contactstatic->getFullName($langs, 1);
-				}
-			}
-
-			if (! empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires du post
-		$formmail->param['action'] = $action;
-		$formmail->param['models'] = $modelmail;
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['facid'] = $object->id;
-		$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
-
-		// Init list of files
-		if (GETPOST("mode") == 'init') {
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
 }
 
 llxFooter();

htdocs/compta/facture/fiche-rec.php

@@ -1122,7 +1122,7 @@ if ($action == 'create')
 		    $disableedit=1;
 		    $disablemove=1;
 		    $disableremove=1;
-		    $ret = $object->printObjectLines('', $mysoc, $soc, $lineid, 0);      // No date selector for template invoice
+		    $ret = $object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
 		}
 
 		print "</table>\n";
@@ -1541,7 +1541,7 @@ else
 		{
 		    //$disableedit=1;
 		    //$disablemove=1;
-		    $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 0);      // No date selector for template invoice
+		    $ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0);      // No date selector for template invoice
 		}
 
 		// Form to add new line
@@ -1552,7 +1552,7 @@ else
     		    $var = true;
 
     		    // Add free products/services
-    		    $object->formAddObjectLine(0, $mysoc, $soc);                          // No date selector for template invoice
+    		    $object->formAddObjectLine(0, $mysoc, $object->thirdparty);                          // No date selector for template invoice
 
     		    $parameters = array();
     		    $reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -1731,7 +1731,7 @@ else
             print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
             print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
-	        print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','',$limit);
+	        print_barre_liste($langs->trans("RepeatableInvoices"),$page,$_SERVER['PHP_SELF'],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'title_accountancy.png',0,'','', $limit);
 
 			print $langs->trans("ToCreateAPredefinedInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'<br><br>';
 

htdocs/compta/facture/list.php

@@ -110,8 +110,8 @@ if (! $sortfield) $sortfield='f.datef';
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+// Initialize technical object to manage context to save list fields
-$contextpage='invoicelist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'invoicelist';
 
 // Security check
 $fieldid = (! empty($ref)?'facnumber':'rowid');
@@ -345,6 +345,7 @@ $formfile = new FormFile($db);
 $bankaccountstatic=new Account($db);
 $facturestatic=new Facture($db);
 $formcompany=new FormCompany($db);
+$thirdpartystatic=new Societe($db);
 
 llxHeader('',$langs->trans('CustomersInvoices'),'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
 
@@ -355,7 +356,7 @@ $sql.= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
 $sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
 $sql.= ' f.paye as paye, f.fk_statut,';
 $sql.= ' f.datec as date_creation, f.tms as date_update,';
-$sql.= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
+$sql.= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql.= " typent.code as typent_code,";
 $sql.= " state.code_departement as state_code, state.nom as state_name";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
@@ -493,7 +494,7 @@ if (! $sall)
     $sql.= ' f.datef, f.date_lim_reglement,';
     $sql.= ' f.paye, f.fk_statut,';
     $sql.= ' f.datec, f.tms,';
-    $sql.= ' s.rowid, s.nom, s.town, s.zip, s.fk_pays, s.code_client, s.client, typent.code,';
+    $sql.= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.code_client, s.client, typent.code,';
     $sql.= ' state.code_departement, state.nom';
 
     foreach ($extrafields->attribute_label as $key => $val) //prevent error with sql_mode=only_full_group_by
@@ -605,106 +606,18 @@ if ($resql)
     print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
     print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
+    print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	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')
 	{
-		$langs->load("mails");
-
-		if (! GETPOST('cancel','alpha'))
-		{
-			$objecttmp=new Facture($db);
-			$listofselectedid=array();
-			$listofselectedthirdparties=array();
-			$listofselectedref=array();
-			foreach($arrayofselected as $toselectid)
-			{
-				$result=$objecttmp->fetch($toselectid);
-				if ($result > 0)
-				{
-					$listofselectedid[$toselectid]=$toselectid;
-					$thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-					$listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
-					$listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
-				}
-			}
-		}
-
-		print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-
-		dol_fiche_head(null, '', '');
-
 		$topicmail="SendBillRef";
 		$modelmail="facture_send";
+		$objecttmp=new Facture($db);
+		$trackid='inv'.$object->id;
 
-		// Cree l'objet formulaire mail
+		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->withform=-1;
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
-		{
-			$formmail->trackid='inv'.$object->id;
-		}
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'inv'.$object->id);
-		}
-		$formmail->withfrom=1;
-		$liste=$langs->trans("AllRecipientSelected");
-		if (count($listofselectedthirdparties) == 1)
-		{
-			$liste=array();
-			$thirdpartyid=array_shift($listofselectedthirdparties);
-   			$soc=new Societe($db);
-    		$soc->fetch($thirdpartyid);
-        	foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-        	{
-        		$liste[$key]=$value;
-        	}
-			$formmail->withtoreadonly=0;
-		}
-		else
-		{
-			$formmail->withtoreadonly=1;
-		}
-		$formmail->withto=$liste;
-		$formmail->withtofree=0;
-		$formmail->withtocc=1;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-		$formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-		// Tableau des substitutions
-		$formmail->substit['__REF__']='__REF__';	// We want to keep the tag
-		$formmail->substit['__SIGNATURE__']=$user->signature;
-		$formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
-		$formmail->substit['__PERSONALIZED__']='';
-		$formmail->substit['__CONTACTCIVNAME__']='';
-
-		// Tableau des parametres complementaires du post
-		$formmail->param['action']=$action;
-		$formmail->param['models']=$modelmail;
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['facid']=join(',',$arrayofselected);
-		// TODO We should use $formmail->param['id']=join(',',$arrayofselected);
-		//$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		print $formmail->get_form();
-
-        dol_fiche_end();
 	}
 
     if ($sall)
@@ -1099,12 +1012,12 @@ if ($resql)
     		if (! empty($arrayfields['s.nom']['checked']))
     		{
                 print '<td class="tdoverflowmax200">';
-                $thirdparty=new Societe($db);
+                $thirdpartystatic->id=$obj->socid;
-                $thirdparty->id=$obj->socid;
+                $thirdpartystatic->name=$obj->name;
-                $thirdparty->name=$obj->name;
+                $thirdpartystatic->client=$obj->client;
-                $thirdparty->client=$obj->client;
+                $thirdpartystatic->code_client=$obj->code_client;
-                $thirdparty->code_client=$obj->code_client;
+                $thirdpartystatic->email=$obj->email;
-                print $thirdparty->getNomUrl(1,'customer');
+                print $thirdpartystatic->getNomUrl(1,'customer');
                 print '</td>';
                 if (! $i) $totalarray['nbfield']++;
     		}

htdocs/compta/paiement/class/paiement.class.php

@@ -507,12 +507,12 @@ class Paiement extends CommonObject
 
 
     /**
-     *      Add a record into bank for payment with links between this bank record and invoices of payment.
+     *      Add a record into bank for payment + links between this bank record and sources of payment.
      *      All payment properties (this->amount, this->amounts, ...) must have been set first like after a call to create().
      *
      *      @param	User	$user               Object of user making payment
      *      @param  string	$mode               'payment', 'payment_supplier'
-     *      @param  string	$label              Label to use in bank record
+     *      @param  string	$label              Label to use in bank record. Note: If label is '(WithdrawalPayment)', a third entry 'widthdraw' is added into bank_url.
      *      @param  int		$accountid          Id of bank account to do link with
      *      @param  string	$emetteur_nom       Name of transmitter
      *      @param  string	$emetteur_banque    Name of bank
@@ -596,10 +596,11 @@ class Paiement extends CommonObject
                 }
 
                 // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                if (! $error  && $label != '(WithdrawalPayment)')
+                //if (! $error && $label != '(WithdrawalPayment)')
+                if (! $error)
                 {
                     $linkaddedforthirdparty=array();
-                    foreach ($this->amounts as $key => $value)  // We should have always same third party but we loop in case of.
+                    foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
                     {
                         if ($mode == 'payment')
                         {

htdocs/compta/prelevement/bons.php

@@ -51,6 +51,9 @@ if (! $sortfield) $sortfield="p.datec";
 // Get supervariables
 $statut = GETPOST('statut','int');
 $search_ref = GETPOST('search_ref','alpha');
+$search_amount = GETPOST('search_amount','alpha');
+
+$bon=new BonPrelevement($db,"");
 
 
 /*
@@ -60,6 +63,7 @@ $search_ref = GETPOST('search_ref','alpha');
 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
 {
     $search_ref="";
+    $search_amount="";
 }
 
 
@@ -69,13 +73,12 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 
 llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
-$bon=new BonPrelevement($db,"");
-
 $sql = "SELECT p.rowid, p.ref, p.amount, p.statut";
 $sql.= ", p.datec";
 $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql.= " WHERE p.entity = ".$conf->entity;
 if ($search_ref) $sql.=natural_search("p.ref", $search_ref);
+if ($search_amount) $sql.=natural_search("p.amount", $search_amount, 1);
 
 $sql.= $db->order($sortfield,$sortorder);
 
@@ -97,6 +100,8 @@ if ($result)
 
   $urladd= "&statut=".$statut;
 
+  $selectedfields='';
+
   // Lines of title fields
   print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
   if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -116,7 +121,9 @@ if ($result)
   print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
   print '<tr class="liste_titre">';
-  print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. $db->escape($search_ref).'"></td>';
+  print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_ref" value="'. dol_escape_htmltag($search_ref).'"></td>';
+  print '<td class="liste_titre">&nbsp;</td>';
+  print '<td class="liste_titre right"><input type="text" class="flat maxwidth100" name="search_amount" value="'. dol_escape_htmltag($search_amount).'"></td>';
   print '<td class="liste_titre">&nbsp;</td>';
   print '<td class="liste_titre" align="right">';
   $searchpicto=$form->showFilterButtons();
@@ -125,9 +132,11 @@ if ($result)
   print '</tr>';
 
   print '<tr class="liste_titre">';
-  print_liste_field_titre("WithdrawalsReceipts",$_SERVER["PHP_SELF"],"p.ref",'','','class="liste_titre"');
+  print_liste_field_titre("WithdrawalsReceipts",$_SERVER["PHP_SELF"],"p.ref",'','','class="liste_titre"',$sortfield,$sortorder);
-  print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"p.datec","","",'class="liste_titre" align="center"');
+  print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"p.datec","","",'class="liste_titre" align="center"',$sortfield,$sortorder);
-  print_liste_field_titre("Amount",$_SERVER["PHP_SELF"],"","","",'align="center"');
+  print_liste_field_titre("Amount",$_SERVER["PHP_SELF"],"p.amount","","",'align="right"',$sortfield,$sortorder);
+  print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"","","",'align="right"',$sortfield,$sortorder);
+  print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
   print "</tr>\n";
 
   while ($i < min($num,$limit))
@@ -136,15 +145,18 @@ if ($result)
 
       print '<tr class="oddeven"><td>';
 
-      print $bon->LibStatut($obj->statut,2);
-      print "&nbsp;";
-
       print '<a href="card.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
 
       print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
 
       print '<td align="right">'.price($obj->amount)."</td>\n";
 
+      print '<td align="right">';
+      print $bon->LibStatut($obj->statut, 3);
+      print '</td>';
+
+      print '<td align="right"></td>'."\n";
+
       print "</tr>\n";
       $i++;
     }

htdocs/compta/prelevement/card.php

@@ -20,7 +20,7 @@
 /**
  *	\file       htdocs/compta/prelevement/card.php
  *	\ingroup    prelevement
- *	\brief      Fiche prelevement
+ *	\brief      Card of a direct debit
  */
 
 require('../../main.inc.php');
@@ -45,20 +45,24 @@ if ($user->societe_id > 0) accessforbidden();
 // Get supervariables
 $action = GETPOST('action','alpha');
 $id = GETPOST('id','int');
+$ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid','int');
 
-
+// Load variable for pagination
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
+$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST("sortorder",'alpha');
+$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST("page",'int');
+$page = GETPOST('page','int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (! $sortfield) $sortfield='pl.fk_soc';
 if (! $sortorder) $sortorder='DESC';
 
+$object = new BonPrelevement($db,"");
+
 
 /*
  * Actions
@@ -66,10 +70,9 @@ if (! $sortorder) $sortorder='DESC';
 
 if ( $action == 'confirm_delete' )
 {
-	$bon = new BonPrelevement($db,"");
+	$object->fetch($id, $ref);
-	$bon->fetch($id);
 
-	$res=$bon->delete();
+	$res=$object->delete();
 	if ($res > 0)
 	{
 		header("Location: index.php");
@@ -77,16 +80,16 @@ if ( $action == 'confirm_delete' )
 	}
 }
 
+// Seems to no be used and replaced with $action == 'infocredit
 if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes')
 {
-	$bon = new BonPrelevement($db,"");
+	$object->fetch($id, $ref);
-	$bon->fetch($id);
 
-	$res=$bon->set_credite();
+	$res=$object->set_credite();
 	if ($res >= 0)
 	{
     	header("Location: card.php?id=".$id);
-	   exit;
+	    exit;
 	}
 }
 
@@ -94,19 +97,18 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	$bon = new BonPrelevement($db,"");
+	$object->fetch($id, $ref);
-	$bon->fetch($id);
 
 	$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
 
 	/*
-	if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $bon->ref)
+	if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
 	{
 		$dir = $conf->prelevement->dir_output.'/receipts';
 
 		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
 		{
-			$bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+			$object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
 		}
 
 		header("Location: card.php?id=".$id);
@@ -118,7 +120,7 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
 		$mesg='BadFile';
 	}*/
 
-	$error = $bon->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+	$error = $object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
 
 	if ($error)
 	{
@@ -127,13 +129,13 @@ if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
 	}
 }
 
+// Set direct debit order to credited, create payment and close invoices
 if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
 {
-	$bon = new BonPrelevement($db,"");
+	$object->fetch($id, $ref);
-	$bon->fetch($id);
 	$dt = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int'));
 
-	$error = $bon->set_infocredit($user, $dt);
+	$error = $object->set_infocredit($user, $dt);
 
 	if ($error)
 	{
@@ -143,61 +145,66 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
 }
 
 
+
 /*
  * View
  */
 
-$bon = new BonPrelevement($db,"");
 $form = new Form($db);
 
 llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
-
+if ($id > 0 || $ref)
-if ($id > 0)
 {
-	$bon->fetch($id);
+	$object->fetch($id, $ref);
 
-	$head = prelevement_prepare_head($bon);
+	$head = prelevement_prepare_head($object);
-	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), '', 'payment');
+	dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
 	if (GETPOST('error','alpha')!='')
 	{
-		print '<div class="error">'.$bon->getErrorString(GETPOST('error','alpha')).'</div>';
+		print '<div class="error">'.$object->getErrorString(GETPOST('error','alpha')).'</div>';
 	}
 
 	/*if ($action == 'credite')
 	{
-		print $form->formconfirm("card.php?id=".$bon->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
+		print $form->formconfirm("card.php?id=".$object->id,$langs->trans("ClassCredited"),$langs->trans("ClassCreditedConfirm"),"confirm_credite",'',1,1);
 
 	}*/
 
+	dol_banner_tab($object, 'ref', '', 1, 'ref', 'ref');
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border" width="100%">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+	//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-	print '<tr><td>'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec,'day').'</td></tr>';
-	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
 	// Status
+	/*
 	print '<tr><td>'.$langs->trans('Status').'</td>';
-	print '<td>'.$bon->getLibStatut(1).'</td>';
+	print '<td>'.$object->getLibStatut(1).'</td>';
 	print '</tr>';
+	*/
 
-	if($bon->date_trans <> 0)
+	if($object->date_trans <> 0)
 	{
 		$muser = new User($db);
-		$muser->fetch($bon->user_trans);
+		$muser->fetch($object->user_trans);
 
 		print '<tr><td>'.$langs->trans("TransData").'</td><td>';
-		print dol_print_date($bon->date_trans,'day');
+		print dol_print_date($object->date_trans,'day');
 		print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
 		print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
-		print $bon->methodes_trans[$bon->method_trans];
+		print $object->methodes_trans[$object->method_trans];
 		print '</td></tr>';
 	}
-	if($bon->date_credit <> 0)
+	if($object->date_credit <> 0)
 	{
 		print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
-		print dol_print_date($bon->date_credit,'day');
+		print dol_print_date($object->date_credit,'day');
 		print '</td></tr>';
 	}
 
@@ -205,19 +212,36 @@ if ($id > 0)
 
 	print '<br>';
 
-	print '<table class="border" width="100%"><tr><td class="titlefield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border" width="100%">';
+
+	$acc = new Account($db);
+	$result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+
+	print '<tr><td class="titlefield">';
+	print $langs->trans("BankToReceiveWithdraw");
+	print '</td>';
+	print '<td>';
+	if ($acc->id > 0)
+		print $acc->getNomUrl(1);
+	print '</td>';
+	print '</tr>';
+
+	print '<tr><td class="titlefield">';
 	print $langs->trans("WithdrawalFile").'</td><td>';
-	$relativepath = 'receipts/'.$bon->ref.'.xml';
+	$relativepath = 'receipts/'.$object->ref.'.xml';
 	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 	print '</td></tr></table>';
 
+	print '</div>';
+
 	dol_fiche_end();
 
 
 
-	if (empty($bon->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted')
+	if (empty($object->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted')
 	{
-		print '<form method="post" name="userfile" action="card.php?id='.$bon->id.'" enctype="multipart/form-data">';
+		print '<form method="post" name="userfile" action="card.php?id='.$object->id.'" enctype="multipart/form-data">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="infotrans">';
 		print '<table class="border" width="100%">';
@@ -227,7 +251,7 @@ if ($id > 0)
 		print $form->select_date('','','','','',"userfile",1,1);
 		print '</td></tr>';
 		print '<tr '.$bc[false].'><td width="20%">'.$langs->trans("TransMetod").'</td><td>';
-		print $form->selectarray("methode",$bon->methodes_trans);
+		print $form->selectarray("methode",$object->methodes_trans);
 		print '</td></tr>';
 /*			print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
 		print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
@@ -238,9 +262,9 @@ if ($id > 0)
 		print '</form>';
 	}
 
-	if (! empty($bon->date_trans) && $bon->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited')
+	if (! empty($object->date_trans) && $object->date_credit == 0 && $user->rights->prelevement->bons->credit && $action=='setcredited')
 	{
-		print '<form name="infocredit" method="post" action="card.php?id='.$bon->id.'">';
+		print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="infocredit">';
 		print '<table class="border" width="100%">';
@@ -261,17 +285,17 @@ if ($id > 0)
 	{
 		print "\n<div class=\"tabsAction\">\n";
 
-		if (empty($bon->date_trans) && $user->rights->prelevement->bons->send)
+		if (empty($object->date_trans) && $user->rights->prelevement->bons->send)
 		{
-			print "<a class=\"butAction\" href=\"card.php?action=settransmitted&id=".$bon->id."\">".$langs->trans("SetToStatusSent")."</a>";
+			print "<a class=\"butAction\" href=\"card.php?action=settransmitted&id=".$object->id."\">".$langs->trans("SetToStatusSent")."</a>";
 		}
 
-		if (! empty($bon->date_trans) && $bon->date_credit == 0)
+		if (! empty($object->date_trans) && $object->date_credit == 0)
 		{
-			print "<a class=\"butAction\" href=\"card.php?action=setcredited&id=".$bon->id."\">".$langs->trans("ClassCredited")."</a>";
+			print "<a class=\"butAction\" href=\"card.php?action=setcredited&id=".$object->id."\">".$langs->trans("ClassCredited")."</a>";
 		}
 
-		print "<a class=\"butActionDelete\" href=\"card.php?action=confirm_delete&id=".$bon->id."\">".$langs->trans("Delete")."</a>";
+		print "<a class=\"butActionDelete\" href=\"card.php?action=confirm_delete&id=".$object->id."\">".$langs->trans("Delete")."</a>";
 
 		print "</div>";
 	}
@@ -293,7 +317,16 @@ if ($id > 0)
 	$sql.= " AND pl.fk_soc = s.rowid";
 	if ($socid)	$sql.= " AND s.rowid = ".$socid;
 	$sql.= $db->order($sortfield, $sortorder);
-	$sql.= $db->plimit($conf->liste_limit+1, $offset);
+
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+	}
+
+	$sql.= $db->plimit($limit+1, $offset);
 
 	$result = $db->query($sql);
 
@@ -304,8 +337,9 @@ if ($id > 0)
 
 		$urladd = "&amp;id=".$id;
 
-		print_barre_liste("", $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num);
+		print_barre_liste($langs->trans("Lines"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
-		print"\n<!-- debut table -->\n";
+
+		print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
 		print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Lines",$_SERVER["PHP_SELF"],"pl.rowid",'',$urladd);
@@ -363,12 +397,17 @@ if ($id > 0)
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans("Total").'</td>';
 			print '<td>&nbsp;</td>';
-			print '<td align="right">'.price($total)."</td>\n";
+			print '<td align="right">';
+			if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+			print price($total);
+			print "</td>\n";
 			print '<td>&nbsp;</td>';
 			print "</tr>\n";
 		}
 
 		print "</table>";
+		print '</div>';
+
 		$db->free($result);
 	}
 	else

htdocs/compta/prelevement/class/bonprelevement.class.php

@@ -38,6 +38,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
  */
 class BonPrelevement extends CommonObject
 {
+	public $element='widthdraw';
+	public $table_element='prelevement_bons';
+	public $picto = 'payment';
+
     var $date_echeance;
     var $raison_sociale;
     var $reference_remise;
@@ -263,10 +267,11 @@ class BonPrelevement extends CommonObject
     /**
      *	Get object and lines from database
      *
-     *	@param	int		$rowid		id of object to load
+     *	@param	int		$rowid		Id of object to load
+     *  @param	string	$ref		Ref of direct debit
      *	@return	int					>0 if OK, <0 if KO
      */
-    function fetch($rowid)
+    function fetch($rowid, $ref='')
     {
         global $conf;
 
@@ -278,8 +283,9 @@ class BonPrelevement extends CommonObject
         $sql.= ", p.fk_user_credit";
         $sql.= ", p.statut";
         $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
-        $sql.= " WHERE p.rowid = ".$rowid;
+        $sql.= " WHERE p.entity = ".$conf->entity;
-        $sql.= " AND p.entity = ".$conf->entity;
+        if ($rowid > 0) $sql.= " AND p.rowid = ".$rowid;
+        else $sql.= " AND p.ref = '".$this->db->escape($ref)."'";
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $result=$this->db->query($sql);
@@ -321,7 +327,7 @@ class BonPrelevement extends CommonObject
     }
 
     /**
-     * Set credite and set status of linked invoices
+     * Set credite and set status of linked invoices. Still used ??
      *
      * @return		int		<0 if KO, >=0 if OK
      */
@@ -345,7 +351,7 @@ class BonPrelevement extends CommonObject
                 $error++;
             }
 
-            if ($error == 0)
+            if (! $error)
             {
                 $facs = array();
                 $facs = $this->getListInvoices();
@@ -361,9 +367,8 @@ class BonPrelevement extends CommonObject
                 }
             }
 
-            if ($error == 0)
+            if (! $error)
             {
-
                 $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
                 $sql.= " SET statut = 2";
                 $sql.= " WHERE fk_prelevement_bons = ".$this->id;
@@ -378,7 +383,7 @@ class BonPrelevement extends CommonObject
             /*
              * End of procedure
              */
-            if ($error == 0)
+            if (! $error)
             {
                 $this->db->commit();
                 return 0;
@@ -399,10 +404,10 @@ class BonPrelevement extends CommonObject
     }
 
     /**
-     *	Set withdrawal to credited status
+     *	Set direct debit order to "credited" status.
      *
-     *	@param	User		$user		id of user
+     *	@param	User	$user			Id of user
-     *	@param 	int	$date		date of action
+     *	@param 	int		$date			date of action
      *	@return	int						>0 if OK, <0 if KO
      */
     function set_infocredit($user, $date)
@@ -436,49 +441,60 @@ class BonPrelevement extends CommonObject
                         $bankaccount = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
                         $facs = array();
                         $amounts = array();
+                        $amountsperthirdparty = array();
 
                         $facs = $this->getListInvoices(1);
 
+                        // Loop on each invoice. $facs=array(0=>id, 1=>amount requested)
                         $num=count($facs);
                         for ($i = 0; $i < $num; $i++)
                         {
                             $fac = new Facture($this->db);
                             $fac->fetch($facs[$i][0]);
                             $amounts[$fac->id] = $facs[$i][1];
+                            $amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
 
 							$totalpaye  = $fac->getSommePaiement();
 							$totalcreditnotes = $fac->getSumCreditNotesUsed();
 							$totaldeposits = $fac->getSumDepositsUsed();
 							$alreadypayed = $totalpaye + $totalcreditnotes + $totaldeposits;
 
-							if ($alreadypayed + $facs[$i][1] >= $fac->total_ttc) {
+							if (price2num($alreadypayed + $facs[$i][1], 'MT') == $fac->total_ttc) {
 								$result = $fac->set_paid($user);
 							}
                         }
 
-                        $paiement = new Paiement($this->db);
+                        // Make one payment per customer
-                        $paiement->datepaye     = $date ;
+                        foreach ($amountsperthirdparty as $thirdpartyid => $cursoramounts)
-                        $paiement->amounts      = $amounts;
+                        {
-                        $paiement->paiementid   = 3; //
+	                        $paiement = new Paiement($this->db);
-                        $paiement->num_paiement = $this->ref ;
+	                        $paiement->datepaye     = $date;
-						$paiement->id_prelevement = $this->id ;
+	                        $paiement->amounts      = $cursoramounts;		// Array with detail of dispatching of payments for each invoice
+	                        $paiement->paiementid   = 3; 					//
+	                        $paiement->num_paiement = $this->ref;			// Set ref of direct debit note
+							$paiement->id_prelevement = $this->id;
 
-                        $paiement_id = $paiement->create($user);
+	                        $paiement_id = $paiement->create($user);
-                        if ($paiement_id < 0)
+	                        if ($paiement_id < 0)
-                        {
+	                        {
-                            dol_syslog(get_class($this)."::set_credite AddPayment Error");
+	                            dol_syslog(get_class($this)."::set_infocredit AddPayment Error");
-                            $error++;
+	                            $error++;
+	                        }
+	                        else
+	                        {
+	                            $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount,'','');
+	                            if ($result < 0)
+	                            {
+	                                dol_syslog(get_class($this)."::set_infocredit AddPaymentToBank Error");
+	                                $error++;
+	                            }
+	                        }
+	                        //var_dump($paiement->amounts);
+	                        //var_dump($thirdpartyid);
+	                        //var_dump($cursoramounts);
                         }
-                        else
+
-                        {
+						// Update withdrawal line
-                            $result=$paiement->addPaymentToBank($user,'payment','(WithdrawalPayment)',$bankaccount,'','');
-                            if ($result < 0)
-                            {
-                                dol_syslog(get_class($this)."::set_credite AddPaymentToBank Error");
-                                $error++;
-                            }
-                        }
-                        // Update withdrawal line
                         // TODO: Translate to ligneprelevement.class.php
                         $sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
                         $sql.= " SET statut = 2";
@@ -486,7 +502,7 @@ class BonPrelevement extends CommonObject
 
                         if (! $this->db->query($sql))
                         {
-                            dol_syslog(get_class($this)."::set_credite Update lines Error");
+                            dol_syslog(get_class($this)."::set_infocredit Update lines Error");
                             $error++;
                         }
 
@@ -951,14 +967,14 @@ class BonPrelevement extends CommonObject
 				}
             }
 
-            /*
-             * Create withdrawal receipt
-             */
             if (!$error)
             {
-                if (count($factures_prev) > 0)
+	            /*
+	             * Create withdrawal receipt in database
+	             */
+            	if (count($factures_prev) > 0)
                 {
-                    foreach ($factures_prev as $fac)
+                    foreach ($factures_prev as $fac)	// Add a link in database for each invoice
                     {
                         // Fetch invoice
                         $fact = new Facture($this->db);
@@ -998,7 +1014,6 @@ class BonPrelevement extends CommonObject
                         }
 
                     }
-
                 }
 
             }
@@ -1006,11 +1021,12 @@ class BonPrelevement extends CommonObject
             if (!$error)
             {
                 /*
-                 * Withdraw receipt
+                 * Create direct debit order in a XML file
                  */
 
             	dol_syslog(__METHOD__."::Init withdraw receipt for ".count($factures_prev)." invoices", LOG_DEBUG);
 
+
                 if (count($factures_prev) > 0)
                 {
                     $this->date_echeance = $datetimeprev;
@@ -1034,11 +1050,12 @@ class BonPrelevement extends CommonObject
 
                     $this->factures = $factures_prev_id;
 
-                    // Generation of SEPA file
+                    // Generation of SEPA file $this->filename
                     $this->generate();
                 }
                 dol_syslog(__METHOD__."::End withdraw receipt, file ".$this->filename, LOG_DEBUG);
             }
+			//var_dump($factures_prev);exit;
 
             /*
              * Update total
@@ -1289,8 +1306,9 @@ class BonPrelevement extends CommonObject
 			$sql.= " AND soc.rowid = f.fk_soc";
 			$sql.= " AND rib.fk_soc = f.fk_soc";
 			$sql.= " AND rib.default_rib = 1";
+			//print $sql;
 
-			//echo $sql;
+			// Define $fileDebiteurSection. One section DrctDbtTxInf per invoice.
 			$resql=$this->db->query($sql);
 			if ($resql)
 			{
@@ -1302,27 +1320,26 @@ class BonPrelevement extends CommonObject
 					$this->total = $this->total + $obj->somme;
 					$i++;
 				}
+				$nbtotalDrctDbtTxInf = $i;
 			}
 			else
 			{
-				fputs($this->file, 'ERREUR DEBITEUR '.$sql.$CrLf);
+				fputs($this->file, 'ERROR DEBITOR '.$sql.$CrLf);		// DEBITOR = Customers
 				$result = -2;
 			}
 
-			/*
+			// Define $fileEmetteurSection. Start of bloc PmtInf. Will contains all DrctDbtTxInf
-			 * section Emetteur(sepa Emetteur bloc lines)
-			 */
 			if ($result != -2)
 			{
-				$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $i, $this->total, $CrLf);
+				$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf);
 			}
 			else
 			{
-				fputs($this->file, 'ERREUR EMETTEUR'.$CrLf);
+				fputs($this->file, 'ERROR CREDITOR'.$CrLf);		// CREDITOR = My company
 			}
 
 			/**
-			 * SECTION CREATION FICHIER SEPA
+			 * SECTION CREATION SEPA FILE
 			 */
 			// SEPA File Header
 			fputs($this->file, '<'.'?xml version="1.0" encoding="UTF-8" standalone="yes"?'.'>'.$CrLf);
@@ -1819,11 +1836,11 @@ class BonPrelevement extends CommonObject
     }
 
     /**
-     *    Return status label for a status
+     *  Return status label for a status
      *
-     *    @param	int		$statut     id statut
+     *  @param	int		$statut     id statut
-     *    @param	int		$mode   	0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
+	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-     * 	  @return	string  		    Label
+     * 	@return	string  		    Label
      */
     function LibStatut($statut,$mode=0)
     {
@@ -1846,8 +1863,25 @@ class BonPrelevement extends CommonObject
             if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
             if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
         }
-
         if ($mode == 3)
+        {
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
+            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
+        }
+        if ($mode == 4)
+        {
+            if ($statut==0) return img_picto($langs->trans($this->labelstatut[$statut]),'statut1').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==1) return img_picto($langs->trans($this->labelstatut[$statut]),'statut3').' '.$langs->trans($this->labelstatut[$statut]);
+            if ($statut==2) return img_picto($langs->trans($this->labelstatut[$statut]),'statut6').' '.$langs->trans($this->labelstatut[$statut]);
+        }
+        if ($mode == 5)
+        {
+            if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
+            if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3');
+            if ($statut==2) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut6');
+        }
+        if ($mode == 6)
         {
             if ($statut==0) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut1');
             if ($statut==1) return $langs->trans($this->labelstatut[$statut]).' '.img_picto($langs->trans($this->labelstatut[$statut]),'statut3');

htdocs/compta/prelevement/create.php

@@ -67,7 +67,7 @@ if ($action == 'create')
     {
     	setEventMessages($bprev->error, $bprev->errors, 'errors');
     }
-    if ($result == 0)
+    elseif ($result == 0)
     {
     	$mesg='';
         $mesg=$langs->trans("NoInvoiceCouldBeWithdrawed");
@@ -78,6 +78,10 @@ if ($action == 'create')
         	$mesg.=$val."<br>\n";
         }
     }
+    else
+    {
+    	setEventMessages($langs->trans("DirectDebitOrderCreated"), null);
+    }
 }
 
 

htdocs/compta/prelevement/factures.php

@@ -43,6 +43,7 @@ if ($user->societe_id > 0) accessforbidden();
 // Get supervariables
 $prev_id = GETPOST('id','int');
 $socid = GETPOST('socid','int');
+$ref = GETPOST('ref', 'alpha');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield = GETPOST("sortfield",'alpha');
@@ -55,6 +56,9 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield='p.ref';
 if (! $sortorder) $sortorder='DESC';
 
+$object = new BonPrelevement($db,"");
+
+
 
 /*
  * View
@@ -65,39 +69,41 @@ $thirdpartytmp = new Societe($db);
 
 llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
-if ($prev_id)
+if ($prev_id > 0 || $ref)
 {
-  	$bon = new BonPrelevement($db,"");
+  	if ($object->fetch($prev_id, $ref) == 0)
-
-  	if ($bon->fetch($prev_id) == 0)
     {
-    	$head = prelevement_prepare_head($bon);
+    	$head = prelevement_prepare_head($object);
-		dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), '', 'payment');
+		dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
+		dol_banner_tab($object, 'ref', '', 1, 'ref', 'ref');
+
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
       	print '<table class="border" width="100%">';
 
-		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
-		print '<tr><td>'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec,'day').'</td></tr>';
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 		// Status
-		print '<tr><td>'.$langs->trans('Status').'</td><td>'.$bon->getLibStatut(1).'</td></tr>';
+		//print '<tr><td>'.$langs->trans('Status').'</td><td>'.$object->getLibStatut(1).'</td></tr>';
 
-		if($bon->date_trans <> 0)
+		if($object->date_trans <> 0)
 		{
 			$muser = new User($db);
-			$muser->fetch($bon->user_trans);
+			$muser->fetch($object->user_trans);
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
-			print dol_print_date($bon->date_trans,'day');
+			print dol_print_date($object->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
-			print $bon->methodes_trans[$bon->method_trans];
+			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if($bon->date_credit <> 0)
+		if($object->date_credit <> 0)
 		{
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
-			print dol_print_date($bon->date_credit,'day');
+			print dol_print_date($object->date_credit,'day');
 			print '</td></tr>';
 		}
 
@@ -105,12 +111,29 @@ if ($prev_id)
 
 		print '<br>';
 
-		print '<table class="border" width="100%"><tr><td class="titlefield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border" width="100%">';
+
+		$acc = new Account($db);
+		$result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+
+		print '<tr><td class="titlefield">';
+		print $langs->trans("BankToReceiveWithdraw");
+		print '</td>';
+		print '<td>';
+		if ($acc->id > 0)
+			print $acc->getNomUrl(1);
+		print '</td>';
+		print '</tr>';
+
+		print '<tr><td class="titlefield">';
 		print $langs->trans("WithdrawalFile").'</td><td>';
-		$relativepath = 'receipts/'.$bon->ref.'.xml';
+		$relativepath = 'receipts/'.$object->ref.'.xml';
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
 
+		print '</div>';
+
 		dol_fiche_end();
 
     }
@@ -137,7 +160,6 @@ $sql.= " AND pf.fk_facture = f.rowid";
 $sql.= " AND f.entity = ".$conf->entity;
 if ($prev_id) $sql.= " AND p.rowid=".$prev_id;
 if ($socid) $sql.= " AND s.rowid = ".$socid;
-
 $sql.= $db->order($sortfield,$sortorder);
 
 // Count total nb of records
@@ -172,9 +194,10 @@ if ($result)
 
 	$massactionbutton='';
 
-	print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	print_barre_liste($langs->trans("Invoices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
   	print"\n<!-- debut table -->\n";
+	print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
   	print '<table class="liste" width="100%">';
   	print '<tr class="liste_titre">';
   	print_liste_field_titre("Bill",$_SERVER["PHP_SELF"],"p.ref",'',$param,'',$sortfield,$sortorder);
@@ -243,13 +266,18 @@ if ($result)
       	print '<tr class="liste_total">';
      	print '<td>'.$langs->trans("Total").'</td>';
       	print '<td>&nbsp;</td>';
-      	print '<td align="right">'.price($total)."</td>\n";
+      	print '<td align="right">';
+		if ($total != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+		print price($total);
+      	print "</td>\n";
       	print '<td>&nbsp;</td>';
       	print '<td>&nbsp;</td>';
       	print "</tr>\n";
     }
 
   	print "</table>";
+  	print '</div>';
+
   	$db->free($result);
 }
 else

htdocs/compta/prelevement/fiche-rejet.php

@@ -41,49 +41,69 @@ if ($user->societe_id > 0) accessforbidden();
 
 // Get supervariables
 $prev_id = GETPOST('id','int');
+$ref = GETPOST('ref', 'alpha');
+
+// Load variable for pagination
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+$object = new BonPrelevement($db,"");
+
+
+
 
 /*
  * View
  */
+
 llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
-if ($prev_id)
+if ($prev_id > 0 || $ref)
 {
-  	$bon = new BonPrelevement($db,"");
+  	if ($object->fetch($prev_id, $ref) == 0)
-
-  	if ($bon->fetch($prev_id) == 0)
     {
-    	$head = prelevement_prepare_head($bon);
+    	$head = prelevement_prepare_head($object);
-		dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), '', 'payment');
+		dol_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
-      	print '<table class="border" width="100%">';
+		dol_banner_tab($object, 'ref', '', 1, 'ref', 'ref');
 
-		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+		print '<div class="fichecenter">';
-		print '<tr><td>'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
+		print '<div class="underbanner clearboth"></div>';
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+		print '<table class="border centpercent">'."\n";
+
+		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec,'day').'</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
 		// Status
+		/*
 		print '<tr><td>'.$langs->trans('Status').'</td>';
-		print '<td>'.$bon->getLibStatut(1).'</td>';
+		print '<td>'.$object->getLibStatut(1).'</td>';
 		print '</tr>';
+		*/
 
-		if($bon->date_trans <> 0)
+		if($object->date_trans <> 0)
 		{
 			$muser = new User($db);
-			$muser->fetch($bon->user_trans);
+			$muser->fetch($object->user_trans);
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
-			print dol_print_date($bon->date_trans,'day');
+			print dol_print_date($object->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
-			print $bon->methodes_trans[$bon->method_trans];
+			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if($bon->date_credit <> 0)
+		if($object->date_credit <> 0)
 		{
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
-			print dol_print_date($bon->date_credit,'day');
+			print dol_print_date($object->date_credit,'day');
 			print '</td></tr>';
 		}
 
@@ -91,12 +111,29 @@ if ($prev_id)
 
 		print '<br>';
 
-		print '<table class="border" width="100%"><tr><td class="titlefield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border" width="100%">';
+
+		$acc = new Account($db);
+		$result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+
+		print '<tr><td class="titlefield">';
+		print $langs->trans("BankToReceiveWithdraw");
+		print '</td>';
+		print '<td>';
+		if ($acc->id > 0)
+			print $acc->getNomUrl(1);
+		print '</td>';
+		print '</tr>';
+
+		print '<tr><td class="titlefield">';
 		print $langs->trans("WithdrawalFile").'</td><td>';
-		$relativepath = 'receipts/'.$bon->ref.'.xml';
+		$relativepath = 'receipts/'.$object->ref.'.xml';
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
 
+		print '</div>';
+
 		dol_fiche_end();
 
     }
@@ -109,7 +146,7 @@ if ($prev_id)
 $rej = new RejetPrelevement($db, $user);
 
 /*
- * Liste des factures
+ * List errors
  */
 $sql = "SELECT pl.rowid, pl.amount, pl.statut";
 $sql.= " , s.rowid as socid, s.nom as name";
@@ -127,12 +164,25 @@ $sql.= " AND pr.fk_prelevement_lignes = pl.rowid";
 if ($socid) $sql.= " AND s.rowid = ".$socid;
 $sql.= " ORDER BY pl.amount DESC";
 
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+}
+
+$sql.= $db->plimit($limit+1, $offset);
+
 $resql = $db->query($sql);
 if ($resql)
 {
  	$num = $db->num_rows($resql);
 
+ 	print_barre_liste($langs->trans("Rejects"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
+
   	print"\n<!-- debut table -->\n";
+  	print '<div class="div-table-responsive-no-min">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
   	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
   	print '<tr class="liste_titre">';
   	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td align="right">'.$langs->trans("Amount").'</td>';
@@ -181,6 +231,8 @@ if ($resql)
     	print "</tr>\n";
     }
     print "</table>\n";
+    print '</div>';
+
 	$db->free($resql);
 }
 else

htdocs/compta/prelevement/fiche-stat.php

@@ -38,7 +38,21 @@ if ($user->societe_id > 0) accessforbidden();
 
 // Get supervariables
 $prev_id = GETPOST('id','int');
+$ref = GETPOST('ref', 'alpha');
+
+// Load variable for pagination
+$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
+$sortfield = GETPOST('sortfield','alpha');
+$sortorder = GETPOST('sortorder','alpha');
 $page = GETPOST('page','int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+
+$object = new BonPrelevement($db,"");
+
 
 /*
  * View
@@ -48,40 +62,44 @@ llxHeader('',$langs->trans("WithdrawalsReceipts"));
 
 if ($prev_id)
 {
-	$bon = new BonPrelevement($db,"");
+	if ($object->fetch($prev_id) == 0)
-
-	if ($bon->fetch($prev_id) == 0)
 	{
-		$head = prelevement_prepare_head($bon);
+		$head = prelevement_prepare_head($object);
-		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), '', 'payment');
+		dol_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
-		print '<table class="border" width="100%">';
+		dol_banner_tab($object, 'ref', '', 1, 'ref', 'ref');
 
-		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
+		print '<div class="fichecenter">';
-		print '<tr><td>'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
+		print '<div class="underbanner clearboth"></div>';
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
+		print '<table class="border centpercent">'."\n";
+
+		//print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec,'day').'</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
 		// Status
+		/*
 		print '<tr><td>'.$langs->trans('Status').'</td>';
-		print '<td>'.$bon->getLibStatut(1).'</td>';
+		print '<td>'.$object->getLibStatut(1).'</td>';
 		print '</tr>';
+		*/
 
-		if($bon->date_trans <> 0)
+		if($object->date_trans <> 0)
 		{
 			$muser = new User($db);
-			$muser->fetch($bon->user_trans);
+			$muser->fetch($object->user_trans);
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
-			print dol_print_date($bon->date_trans,'day');
+			print dol_print_date($object->date_trans,'day');
 			print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
-			print $bon->methodes_trans[$bon->method_trans];
+			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if($bon->date_credit <> 0)
+		if($object->date_credit <> 0)
 		{
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
-			print dol_print_date($bon->date_credit,'day');
+			print dol_print_date($object->date_credit,'day');
 			print '</td></tr>';
 		}
 
@@ -89,12 +107,29 @@ if ($prev_id)
 
 		print '<br>';
 
-		print '<table class="border" width="100%"><tr><td class="titlefield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border" width="100%">';
+
+		$acc = new Account($db);
+		$result=$acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+
+		print '<tr><td class="titlefield">';
+		print $langs->trans("BankToReceiveWithdraw");
+		print '</td>';
+		print '<td>';
+		if ($acc->id > 0)
+			print $acc->getNomUrl(1);
+		print '</td>';
+		print '</tr>';
+
+		print '<tr><td class="titlefield">';
 		print $langs->trans("WithdrawalFile").'</td><td>';
-		$relativepath = 'receipts/'.$bon->ref.'.xml';
+		$relativepath = 'receipts/'.$object->ref.'.xml';
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
 
+		print '</div>';
+
 		dol_fiche_end();
 
 	}
@@ -139,7 +174,7 @@ if ($prev_id)
 			print price($row[0]);
 
 			print '</td><td align="right">';
-			if ($bon->amount) print round($row[0]/$bon->amount*100,2)." %";
+			if ($object->amount) print round($row[0]/$object->amount*100,2)." %";
 			print '</td>';
 
 			print "</tr>\n";

htdocs/contact/card.php

@@ -224,7 +224,7 @@ if (empty($reshook))
                 $action = 'create';
 			} else {
 				// Categories association
-				$contcats = GETPOST( 'contcats', 'array' );
+				$contcats = GETPOST( 'contcats', 'array');
 				$object->setCategories($contcats);
 			}
         }
@@ -383,7 +383,7 @@ if (empty($reshook))
 				$db->query( $sql );
 
 				// Then we add the associated categories
-				$categories = GETPOST( 'contcats', 'array' );
+				$categories = GETPOST( 'contcats', 'array');
 				$object->setCategories($categories);
 
                 $object->old_lastname='';

htdocs/contrat/card.php

@@ -965,6 +965,7 @@ if (empty($reshook))
 	$trackid='cont'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
+
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->contrat->creer)
 	{
 		if ($action == 'addcontact')
@@ -2052,62 +2053,73 @@ else
             $parameters=array();
             $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action);    // Note that $action and $object may have been modified by hook
 
-            if ($object->statut == 0 && $nbofservices)
+            if (empty($reshook))
             {
-                if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
+            	// Send
-                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+            	if ($object->statut == 1) {
-            }
+            		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
-            if ($object->statut == 1)
+            			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
-            {
+            		} else
-                if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
+            			print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
-                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+            	}
-            }
 
-            if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
+	            if ($object->statut == 0 && $nbofservices)
-            {
+	            {
-                $langs->load("bills");
+	                if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a></div>';
-                if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
+	                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
-                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+	            }
-            }
+	            if ($object->statut == 1)
+	            {
+	                if ($user->rights->contrat->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a></div>';
+	                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+	            }
 
-            if (! empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
+	            if (! empty($conf->facture->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
-            {
+	            {
-            	$langs->load("orders");
+	                $langs->load("bills");
-            	if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
+	                if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
-            	else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+	                else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
-            }
+	            }
 
-            // Clone
+	            if (! empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices)
-            if ($user->rights->contrat->creer) {
+	            {
-            	print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
+	            	$langs->load("orders");
-            }
+	            	if ($user->rights->commande->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
+	            	else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+	            }
 
-            if ($object->nbofservicesclosed > 0)
+	            // Clone
-            {
+	            if ($user->rights->contrat->creer) {
-            	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
+	            	print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&amp;socid=' . $object->socid . '&amp;action=clone&amp;object=' . $object->element . '">' . $langs->trans("ToClone") . '</a></div>';
-            }
+	            }
-            if ($object->nbofservicesclosed < $nbofservices)
-            {
-                //if (! $numactive)
-                //{
-                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-                //}
-                //else
-                //{
-                //	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
-                //}
-            }
 
-            // On peut supprimer entite si
+	            if ($object->nbofservicesclosed > 0)
-            // - Droit de creer + mode brouillon (erreur creation)
+	            {
-            // - Droit de supprimer
+	            	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate">'.$langs->trans("ActivateAllContracts").'</a></div>';
-            if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
+	            }
-            {
+	            if ($object->nbofservicesclosed < $nbofservices)
-                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
+	            {
-            }
+	                //if (! $numactive)
-            else
+	                //{
-            {
+	                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close">'.$langs->trans("CloseAllContracts").'</a></div>';
-            	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
+	                //}
+	                //else
+	                //{
+	                //	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("CloseRefusedBecauseOneServiceActive").'">'.$langs->trans("Close").'</a></div>';
+	                //}
+	            }
+
+	            // On peut supprimer entite si
+	            // - Droit de creer + mode brouillon (erreur creation)
+	            // - Droit de supprimer
+	            if (($user->rights->contrat->creer && $object->statut == 0) || $user->rights->contrat->supprimer)
+	            {
+	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans("Delete").'</a></div>';
+	            }
+	            else
+	            {
+	            	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
+	            }
             }
 
             print "</div>";
@@ -2193,7 +2205,7 @@ else
 			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
 			print '<div class="clearboth"></div>';
 			print '<br>';
-			print load_fiche_titre($langs->trans('SendContractByMail'));
+			print load_fiche_titre($langs->trans('SendByMail'));
 
 			dol_fiche_head('');
 
@@ -2207,7 +2219,7 @@ else
                 $formmail->fromid = $user->id;
 
             }
-			$formmail->trackid='ord'.$object->id;
+			$formmail->trackid='cont'.$object->id;
 			if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
 			{
 				include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -2229,9 +2241,18 @@ else
 			$formmail->withbody = 1;
 			$formmail->withdeliveryreceipt = 1;
 			$formmail->withcancel = 1;
-			// Tableau des substitutions
+			// Array of substitutions
 			$formmail->setSubstitFromObject($object);
-			$formmail->substit ['__CONTRACTREF__'] = $object->ref;
+			$datenextexpiration='';
+			foreach($object->lines as $line)
+			{
+				if ($line->statut != 4) continue;
+				if ($line->date_fin_prevue > $datenextexpiration) $datenextexpiration = $line->date_fin_prevue;
+			}
+			$formmail->substit['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+			$formmail->substit['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+			$formmail->substit['__PERSONALIZED__']='';
+			$formmail->substit['__CONTACTCIVNAME__']='';
 
 			$custcontact = '';
 			$contactarr = array();
@@ -2243,7 +2264,7 @@ else
 				{
 					if ($contact['libelle'] == $langs->trans('TypeContact_contract_external_CUSTOMER')) {	// TODO Use code and not label
 						$contactstatic = new Contact($db);
-						$contactstatic->fetch($contact ['id']);
+						$contactstatic->fetch($contact['id']);
 						$custcontact = $contactstatic->getFullName($langs, 1);
 					}
 				}

htdocs/contrat/list.php

@@ -29,8 +29,9 @@
  */
 
 require ("../main.inc.php");
-require_once (DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
+require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
@@ -52,6 +53,7 @@ $search_state=trim(GETPOST("search_state"));
 $search_country=GETPOST("search_country",'int');
 $search_type_thirdparty=GETPOST("search_type_thirdparty",'int');
 $search_contract=GETPOST('search_contract');
+$search_ref_customer=GETPOST('search_ref_customer','alpha');
 $search_ref_supplier=GETPOST('search_ref_supplier','alpha');
 $sall=GETPOST('sall', 'alphanohtml');
 $search_status=GETPOST('search_status');
@@ -81,6 +83,8 @@ $id=GETPOST('id','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'contrat', $id);
 
+$diroutputmassaction=$conf->contrat->dir_output . '/temp/massgeneration/'.$user->id;
+
 $staticcontrat=new Contrat($db);
 $staticcontratligne=new ContratLigne($db);
 
@@ -158,6 +162,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x',
 	$search_type='';
 	$search_country='';
 	$search_contract="";
+	$search_ref_customer="";
 	$search_ref_supplier="";
     $search_user='';
     $search_sale='';
@@ -184,7 +189,8 @@ if (empty($reshook))
  */
 
 $now=dol_now();
-$form=new Form($db);
+$form = new Form($db);
+$formfile = new FormFile($db);
 $formother = new FormOther($db);
 $socstatic = new Societe($db);
 $contracttmp = new Contrat($db);
@@ -241,6 +247,7 @@ else if ($year > 0)
 }
 if ($search_name) $sql .= natural_search('s.nom', $search_name);
 if ($search_contract) $sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
+if (!empty($search_ref_customer)) $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
 if (!empty($search_ref_supplier)) $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
 if ($search_sale > 0)
 {
@@ -334,8 +341,8 @@ if ($resql)
 
     // List of mass actions available
     $arrayofmassactions =  array(
-        //'presend'=>$langs->trans("SendByMail"),
+        'presend'=>$langs->trans("SendByMail"),
-        //'builddoc'=>$langs->trans("PDFMerge"),
+        'builddoc'=>$langs->trans("PDFMerge"),
     );
     if ($user->rights->contrat->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
     if ($massaction == 'presend') $arrayofmassactions=array();
@@ -352,6 +359,16 @@ 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';
+    }
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -417,13 +434,13 @@ if ($resql)
     if (! empty($arrayfields['c.ref_customer']['checked']))
     {
         print '<td class="liste_titre">';
-        print '<input type="text" class="flat" size="6" name="search_ref_customer value="'.dol_escape_htmltag($search_ref_customer).'">';
+        print '<input type="text" class="flat" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
         print '</td>';
     }
     if (! empty($arrayfields['c.ref_supplier']['checked']))
     {
         print '<td class="liste_titre">';
-        print '<input type="text" class="flat" size="6" name="search_ref_supplier value="'.dol_escape_htmltag($search_ref_supplier).'">';
+        print '<input type="text" class="flat" size="6" name="search_ref_supplier" value="'.dol_escape_htmltag($search_ref_supplier).'">';
         print '</td>';
     }
     if (! empty($arrayfields['s.nom']['checked']))
@@ -586,6 +603,13 @@ if ($resql)
                 print '<a href="'.DOL_URL_ROOT.'/contrat/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"),'object_generic').'</a>';
                 print '</span>';
             }
+
+            $filename=dol_sanitizeFileName($obj->ref);
+            $filedir=$conf->contrat->dir_output . '/' . dol_sanitizeFileName($obj->ref);
+            $urlsource=$_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+            print $formfile->getDocumentsLink($contracttmp->element, $filename, $filedir);
+            print '</td>';
+
             print '</td>';
         }
         if (! empty($arrayfields['c.ref_customer']['checked']))
@@ -750,6 +774,25 @@ if ($resql)
     print '</div>';
 
     print '</form>';
+
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+    {
+    	/*
+    	 * Show list of available documents
+    	 */
+    	$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+    	$urlsource.=str_replace('&amp;','&',$param);
+
+    	$filedir=$diroutputmassaction;
+    	$genallowed=$user->rights->contrat->lire;
+    	$delallowed=$user->rights->contrat->lire;
+
+    	print $formfile->showdocuments('massfilesarea_contract','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+    }
+    else
+    {
+    	print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+    }
 }
 else
 {

htdocs/contrat/services.php

@@ -285,7 +285,7 @@ if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) &&
 llxHeader(null, $langs->trans("Services"));
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 if ($search_contract) $param.='&search_contract='.urlencode($search_contract);
 if ($search_name)      $param.='&search_name='.urlencode($search_name);
@@ -326,6 +326,7 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $title=$langs->trans("ListOfServices");
 if ($mode == "0") $title=$langs->trans("ListOfInactiveServices");	// Must use == "0"

htdocs/core/actions_fetchobject.inc.php

@@ -28,7 +28,7 @@
 // $cancel must be defined
 // $id or $ref must be defined (object is loaded in this file with fetch)
 
-if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && empty($cancel))
+if (($id > 0 || (! empty($ref) && ! in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
 {
     $ret = $object->fetch($id, $ref);
     if ($ret > 0)

htdocs/core/actions_massactions.inc.php

@@ -52,7 +52,7 @@ if (! $error && count($toselect) > $maxformassaction)
     $error++;
 }
 
-if (! $error && $massaction == 'confirm_presend' && GETPOST('modelselected'))  // If we change the template, we must not send email, but keep on send email form
+if (! $error && $massaction == 'confirm_presend' && ! GETPOST('sendmail'))  // If we do not choose button send (for example when we change template or limit), we must not send email, but keep on send email form
 {
     $massaction='presend';
 }
@@ -64,35 +64,63 @@ if (! $error && $massaction == 'confirm_presend')
     $langs->load("mails");
     include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    if (!$error && !isset($user->email))
+    $listofobjectid=array();
-    {
+    $listofobjectthirdparties=array();
-        $error++;
+    $listofobjectref=array();
-        setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
-    }
 
     if (! $error)
     {
         $thirdparty=new Societe($db);
+        if ($objecttmp->element == 'expensereport') $thirdparty=new User($db);
+
         $objecttmp=new $objectclass($db);
-        $listofobjectid=array();
-        $listofobjectthirdparties=array();
-        $listofobjectref=array();
         foreach($toselect as $toselectid)
         {
-            $objecttmp=new $objectclass($db);	// must create new instance because instance is saved into $listofobjectref array for future use
+            $objecttmp=new $objectclass($db);	// we must create new instance because instance is saved into $listofobjectref array for future use
             $result=$objecttmp->fetch($toselectid);
             if ($result > 0)
             {
                 $listofobjectid[$toselectid]=$toselectid;
                 $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
+                if ($objecttmp->element == 'societe') $thirdpartyid=$objecttmp->id;
+                if ($objecttmp->element == 'expensereport') $thirdpartyid=$objecttmp->fk_user_author;
                 $listofobjectthirdparties[$thirdpartyid]=$thirdpartyid;
                 $listofobjectref[$thirdpartyid][$toselectid]=$objecttmp;
             }
         }
-        //var_dump($listofobjectthirdparties);exit;
+    }
 
+    // Check mandatory parameters
+    if (empty($user->email))
+    {
+        $error++;
+        setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
+        $massaction='presend';
+    }
 
-        // Loop on each thirdparty
+    $receiver=$_POST['receiver'];
+    if (! is_array($receiver))
+    {
+    	if (empty($receiver) || $receiver == '-1') $receiver=array();
+    	else $receiver=array($receiver);
+    }
+    if (count($receiver) == 0 && count($listofobjectthirdparties) == 1)	// if only one recipient, receiver is mandatory
+    {
+     	$error++;
+       	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
+       	$massaction='presend';
+    }
+
+    if (! GETPOST('subject','none'))
+    {
+    	$error++;
+    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTopic")), null, 'warnings');
+    	$massaction='presend';
+    }
+
+    // Loop on each recipient/thirdparty
+    if (! $error)
+    {
         foreach ($listofobjectthirdparties as $thirdpartyid)
         {
             $result = $thirdparty->fetch($thirdpartyid);
@@ -108,12 +136,6 @@ if (! $error && $massaction == 'confirm_presend')
             $sendtoid = array();
 
             // Define $sendto
-            $receiver=$_POST['receiver'];
-            if (! is_array($receiver))
-            {
-            	if ($receiver == '-1') $receiver=array();
-            	else $receiver=array($receiver);
-            }
             $tmparray=array();
             if (trim($_POST['sendto']))
             {
@@ -172,74 +194,99 @@ if (! $error && $massaction == 'confirm_presend')
             $attachedfiles=array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
             $listofqualifiedid=array();
             $listofqualifiedref=array();
+            $thirdpartywithoutemail=array();
+
             foreach($listofobjectref[$thirdpartyid] as $objectid => $object)
             {
                 //var_dump($thirdpartyid.' - '.$objectid.' - '.$object->statut);
-
+                if ($objectclass == 'Propal' && $object->statut == Propal::STATUS_DRAFT)
-                if ($objectclass == 'Facture' && $object->statut != Facture::STATUS_VALIDATED)
                 {
                 	$langs->load("errors");
                     $nbignored++;
-                    $resaction.='<div class="error">'.$langs->trans('ErrorOnlyInvoiceValidatedCanBeSentInMassAction',$object->ref).'</div><br>';
+                    $resaction.='<div class="error">'.$langs->trans('ErrorOnlyProposalNotDraftCanBeSentInMassAction',$object->ref).'</div><br>';
                     continue; // Payment done or started or canceled
                 }
-                if ($objectclass == 'Commande' && $object->statut == Commande::STATUS_DRAFT)
+            	if ($objectclass == 'Commande' && $object->statut == Commande::STATUS_DRAFT)
                 {
                 	$langs->load("errors");
                     $nbignored++;
                     $resaction.='<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction',$object->ref).'</div><br>';
                     continue;
                 }
-
+                if ($objectclass == 'Facture' && $object->statut != Facture::STATUS_VALIDATED)
-                // Read document
-                // TODO Use future field $object->fullpathdoc to know where is stored default file
-                // TODO If not defined, use $object->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
-                $filename=dol_sanitizeFileName($object->ref).'.pdf';
-                $filedir=$uploaddir . '/' . dol_sanitizeFileName($object->ref);
-                $file = $filedir . '/' . $filename;
-                $mime = dol_mimetype($file);
-
-                if (dol_is_file($file))
                 {
-                    if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
+                	$langs->load("errors");
-                    {
+                	$nbignored++;
-                        $object->fetch_thirdparty();
+                	$resaction.='<div class="error">'.$langs->trans('ErrorOnlyInvoiceValidatedCanBeSentInMassAction',$object->ref).'</div><br>';
-                        $sendto = $object->thirdparty->email;
+                	continue; // Payment done or started or canceled
-                    }
-
-                    if (empty($sendto))
-                    {
-                        //print "No recipient for thirdparty ".$object->thirdparty->name;
-                        $nbignored++;
-                        continue;
-                    }
-
-                    if (dol_strlen($sendto))
-                    {
-                        // Create form object
-                        $attachedfiles=array(
-                            'paths'=>array_merge($attachedfiles['paths'],array($file)),
-                            'names'=>array_merge($attachedfiles['names'],array($filename)),
-                            'mimes'=>array_merge($attachedfiles['mimes'],array($mime))
-                        );
-                    }
-
-                    $listofqualifiedid[$objectid]=$object;
-                    $listofqualifiedref[$objectid]=$object->ref;
-                }
-                else
-                {
-                    $nbignored++;
-                    $langs->load("errors");
-                    $resaction.='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div><br>';
-                    dol_syslog('Failed to read file: '.$file, LOG_WARNING);
-                    continue;
                 }
 
+                // Test recipient
+	            if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
+	            {
+	            	if ($object->element == 'expensereport')
+	            	{
+						$fuser = new User($db);
+						$fuser->fetch($object->fk_user_author);
+						$sendto = $fuser->email;
+	            	}
+	            	else
+	            	{
+	            		$object->fetch_thirdparty();
+	               		$sendto = $object->thirdparty->email;
+	            	}
+	            }
+
+	            if (empty($sendto))
+	            {
+	               	//print "No recipient for thirdparty ".$object->thirdparty->name;
+	               	$nbignored++;
+	                if (empty($thirdpartywithoutemail[$object->thirdparty->id]))
+	                {
+	                	$resaction.='<div class="error">'.$langs->trans('NoRecipientEmail',$object->thirdparty->name).'</div><br>';
+	                }
+	               	dol_syslog('No recipient for thirdparty: '.$object->thirdparty->name, LOG_WARNING);
+	               	$thirdpartywithoutemail[$object->thirdparty->id]=1;
+	               	continue;
+	            }
+
+	            if ($_POST['addmaindocfile'])
+	            {
+	            	// TODO Use future field $object->fullpathdoc to know where is stored default file
+	            	// TODO If not defined, use $object->modelpdf (or defaut invoice config) to know what is template to use to regenerate doc.
+	            	$filename=dol_sanitizeFileName($object->ref).'.pdf';
+	            	$filedir=$uploaddir . '/' . dol_sanitizeFileName($object->ref);
+	            	$file = $filedir . '/' . $filename;
+	            	$mime = dol_mimetype($file);
+
+       	            if (dol_is_file($file))
+		            {
+		                	// Create form object
+		                	$attachedfiles=array(
+		                	'paths'=>array_merge($attachedfiles['paths'],array($file)),
+		                	'names'=>array_merge($attachedfiles['names'],array($filename)),
+		                	'mimes'=>array_merge($attachedfiles['mimes'],array($mime))
+		                	);
+		            }
+		            else
+		            {
+	    	                $nbignored++;
+	        	            $langs->load("errors");
+	            	        $resaction.='<div class="error">'.$langs->trans('ErrorCantReadFile',$file).'</div><br>';
+	                	    dol_syslog('Failed to read file: '.$file, LOG_WARNING);
+	                    	continue;
+		            }
+	            }
+
+	            // Object of thirdparty qualified
+	            $listofqualifiedid[$objectid]=$object;
+	            $listofqualifiedref[$objectid]=$object->ref;
+
+
                 //var_dump($listofqualifiedref);
             }
 
-            // Loop on each qualified objects of the thirdparty
+            // Send email if there is at least one qualified record
             if (count($listofqualifiedid) > 0)
             {
                 $langs->load("commercial");
@@ -264,8 +311,8 @@ if (! $error && $massaction == 'confirm_presend')
                 }
 
                 $replyto = $from;
-                $subject = GETPOST('subject');
+                $subject = GETPOST('subject','none');
-                $message = GETPOST('message');
+                $message = GETPOST('message','none');
                 $sendtocc = GETPOST('sentocc');
                 $sendtobcc = '';
                 if ($objectclass == 'Propale') 				$sendtocc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO);
@@ -275,28 +322,18 @@ if (! $error && $massaction == 'confirm_presend')
                 if ($objectclass == 'CommandeFournisseur')	$sendtocc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO);
                 if ($objectclass == 'FactureFournisseur')	$sendtocc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO);
 
+                $objecttmp=new $objectclass($db);
+                $objecttmp->thirdparty = $thirdparty;
 
-                $substitutionarray=array(
+                // Make substitution in email content
-                	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+                $substitutionarray=getCommonSubstitutionArray($langs, 0, null, $objecttmp);
-                	'__ID__' => join(', ',array_keys($listofqualifiedid)),
+                $substitutionarray['__ID__'] = join(', ',array_keys($listofqualifiedid));
-                    '__EMAIL__' => $thirdparty->email,
+                $substitutionarray['__EMAIL__'] = $thirdparty->email;
-                    '__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
+                $substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-                    '__FACREF__' => join(', ',$listofqualifiedref),            // For backward compatibility
+                $substitutionarray['__REF__'] = join(', ',$listofqualifiedref);
-                    '__ORDERREF__' => join(', ',$listofqualifiedref),          // For backward compatibility
+
-                    '__PROPREF__' => join(', ',$listofqualifiedref),           // For backward compatibility
+                $parameters=array('mode'=>'formemail');
-                    '__REF__' => join(', ',$listofqualifiedref),
+                complete_substitutions_array($substitutionarray, $langs, $objecttmp, $parameters);
-                    '__REFCLIENT__' => $thirdparty->name,
-					'__SIGNATURE__' =>  (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?dol_string_nohtmltag($user->signature):'')
-                	/* not available on all object
-					/'__FIRSTNAME__'=>(is_object($object)?$object->firstname:''),
-					'__LASTNAME__'=>(is_object($object)?$object->lastname:''),
-					'__FULLNAME__'=>(is_object($object)?$object->getFullName($langs):''),
-					'__ADDRESS__'=>(is_object($object)?$object->address:''),
-					'__ZIP__'=>(is_object($object)?$object->zip:''),
-					'__TOWN_'=>(is_object($object)?$object->town:''),
-					'__COUNTRY__'=>(is_object($object)?$object->country:''),
-					*/
-                );
 
                 $subject=make_substitutions($subject, $substitutionarray);
                 $message=make_substitutions($message, $substitutionarray);
@@ -350,18 +387,32 @@ if (! $error && $massaction == 'confirm_presend')
                             $object->fk_element		= $objid;
                             $object->elementtype	= $object->element;
 
-                            // Appel des triggers
+                            $triggername = strtoupper(get_class($object)) .'_SENTBYMAIL';
-                            include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+                            if ($triggername == 'SOCIETE_SENTBYMAIL')    $triggername = 'COMPANY_SENTBYEMAIL';
-                            $interface=new Interfaces($db);
+                            if ($triggername == 'CONTRAT_SENTBYMAIL')    $triggername = 'CONTRACT_SENTBYEMAIL';
-                            $result=$interface->run_triggers('BILL_SENTBYMAIL',$object,$user,$langs,$conf);
+                            if ($triggername == 'COMMANDE_SENTBYMAIL')   $triggername = 'ORDER_SENTBYEMAIL';
-                            if ($result < 0) { $error++; $errors=$interface->errors; }
+                            if ($triggername == 'FACTURE_SENTBYMAIL')    $triggername = 'BILL_SENTBYEMAIL';
-                            // Fin appel triggers
+                            if ($triggername == 'EXPEDITION_SENTBYMAIL') $triggername = 'SHIPPING_SENTBYEMAIL';
+                            if ($triggername == 'COMMANDEFOURNISSEUR_SENTBYMAIL') $triggername = 'ORDER_SUPPLIER_SENTBYMAIL';
+                            if ($triggername == 'FACTUREFOURNISSEUR_SENTBYMAIL') $triggername = 'BILL_SUPPLIER_SENTBYEMAIL';
+                            if ($triggername == 'SUPPLIERPROPOSAL_SENTBYMAIL') $triggername = 'PROPOSAL_SUPPLIER_SENTBYEMAIL';
 
-                            if ($error)
+                            if (! empty($trigger_name))
                             {
-                                setEventMessages($db->lasterror(), $errors, 'errors');
+	                            // Appel des triggers
-                                dol_syslog("Error in trigger BILL_SENTBYMAIL ".$db->lasterror(), LOG_ERR);
+	                            include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+	                            $interface=new Interfaces($db);
+	                            $result=$interface->run_triggers($trigger_name, $object, $user, $langs, $conf);
+	                            if ($result < 0) { $error++; $errors=$interface->errors; }
+	                            // Fin appel triggers
+
+	                            if ($error)
+	                            {
+	                                setEventMessages($db->lasterror(), $errors, 'errors');
+	                                dol_syslog("Error in trigger ".$trigger_name.' '.$db->lasterror(), LOG_ERR);
+	                            }
                             }
+
                             $nbsent++;
                         }
                     }
@@ -400,14 +451,20 @@ if (! $error && $massaction == 'confirm_presend')
             //setEventMessages($langs->trans("EMailSentToNRecipients", 0), null, 'warnings');  // May be object has no generated PDF file
             setEventMessages($resaction, null, 'warnings');
         }
-    }
 
-    $action='list';
+        $action='list';
-    $massaction='';
+    	$massaction='';
+    }
 }
 
 if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_search'))
 {
+	if (empty($diroutputmassaction))
+	{
+		dol_print_error(null, 'include of actions_massactions.inc.php is done but var $diroutputmassaction was not defined');
+		exit;
+	}
+
     require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -502,7 +559,13 @@ if (! $error && $massaction == "builddoc" && $permtoread && ! GETPOST('button_se
     }
     else {
 	    // Create empty PDF
-	    $pdf=pdf_getInstance();
+    	$formatarray=pdf_getFormat();
+    	$page_largeur = $formatarray['width'];
+    	$page_hauteur = $formatarray['height'];
+    	$format = array($page_largeur,$page_hauteur);
+
+	    $pdf=pdf_getInstance($format);
+
 	    if (class_exists('TCPDF'))
 	    {
 			$pdf->setPrintHeader(false);
@@ -573,7 +636,7 @@ if ($action == 'remove_file')
     $action='';
 }
 
-// Validate  records
+// Validate records
 if (! $error && $massaction == 'validate' && $permtocreate)
 {
 	if ($object->element == 'invoice_supplier' && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
@@ -645,8 +708,19 @@ if (! $error && $massaction == 'delete' && $permtodelete)
     	$result=$objecttmp->fetch($toselectid);
         if ($result > 0)
         {
+        	// Refuse deletion for some status ?
+        	/*
+       		if ($objectclass == 'Facture' && $objecttmp->status == Facture::STATUS_DRAFT)
+       		{
+       			$langs->load("errors");
+       			$nbignored++;
+       			$resaction.='<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction',$object->ref).'</div><br>';
+       			continue;
+       		}*/
+
             if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
             else $result = $objecttmp->delete($user);
+
             if ($result <= 0)
             {
                 setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');

htdocs/core/actions_sendmails.inc.php

@@ -24,7 +24,7 @@
 // $mysoc must be defined
 // $id must be defined
 // $paramname must be defined
-// $mode must be defined
+// $mode must be defined (used to know the automatic BCC to add)
 // $trigger_name must be set (can be '')
 // $actiontypecode can be set
 // $object and $uobject may be defined
@@ -258,7 +258,8 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			}
 
 			$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
-			$message = $_POST['message'];
+			$message = GETPOST('message','none');
+			$subject = GETPOST('subject','none');
 
 			// Make a change into HTML code to allow to include images from medias directory with an external reabable URL.
 			// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
@@ -267,18 +268,17 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 			$message=preg_replace('/(<img.*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $message);
 
 			$sendtobcc= GETPOST('sendtoccc');
-			if ($mode == 'emailfromproposal')         $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO));
+			// Autocomplete the $sendtobcc
-			if ($mode == 'emailfromorder')            $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO));
+			// $autocopy can be MAIN_MAIL_AUTOCOPY_PROPOSAL_TO, MAIN_MAIL_AUTOCOPY_ORDER_TO, MAIN_MAIL_AUTOCOPY_INVOICE_TO, MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO...
-			if ($mode == 'emailfrominvoice')          $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO));
+			if (! empty($autocopy))
-			if ($mode == 'emailfromsupplierproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_PROPOSAL_TO));
+			{
-			if ($mode == 'emailfromsupplierorder')    $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO));
+				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc?", ":"").$conf->global->$autocopy));
-			if ($mode == 'emailfromsupplierinvoice')  $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO));
+			}
 
 			$deliveryreceipt = $_POST['deliveryreceipt'];
 
 			if ($action == 'send' || $action == 'relance')
 			{
-				if (dol_strlen($_POST['subject'])) $subject = $_POST['subject'];
 				$actionmsg2=$langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from,4,0,1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto,4,0,1);
 				if ($message)
 				{
@@ -344,23 +344,25 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
 				}
 			}
 
-			$substitutionarray=array(
+			// Make substitution in email content
-				'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+			$substitutionarray=getCommonSubstitutionArray($langs, 0, null, $object);
-				'__ID__' => (is_object($object)?$object->id:''),
+			$substitutionarray['__EMAIL__'] = $sendto;
-				'__EMAIL__' => $sendto,
+			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'';
-				'__CHECK_READ__' => (is_object($object) && is_object($object->thirdparty))?'<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>':'',
+			// Add specific substitution for contracts
-				'__REF__' => (is_object($object)?$object->ref:''),
+			if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
-				'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))?dol_string_nohtmltag($user->signature):'')
+			{
-				/* not available on all object
+				$datenextexpiration='';
-				/'__FIRSTNAME__'=>(is_object($object)?$object->firstname:''),
+				foreach($object->lines as $line)
-				'__LASTNAME__'=>(is_object($object)?$object->lastname:''),
+				{
-				'__FULLNAME__'=>(is_object($object)?$object->getFullName($langs):''),
+					if ($line->statut != 4) continue;
-				'__ADDRESS__'=>(is_object($object)?$object->address:''),
+					if ($line->date_fin_prevue > $datenextexpiration) $datenextexpiration = $line->date_fin_prevue;
-				'__ZIP__'=>(is_object($object)?$object->zip:''),
+				}
-				'__TOWN_'=>(is_object($object)?$object->town:''),
+				$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
-				'__COUNTRY__'=>(is_object($object)?$object->country:''),
+				$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
-				*/
+			}
-			);
+
+			$parameters=array('mode'=>'formemail');
+			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
 
 			$subject=make_substitutions($subject, $substitutionarray);
 			$message=make_substitutions($message, $substitutionarray);
@@ -424,7 +426,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
     						include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
     						$interface=new Interfaces($db);
     						$result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf);
-    						if ($result < 0) {
+							if ($result < 0) {
     							$error++; $errors=$interface->errors;
     						}
 						}

htdocs/core/boxes/box_activity.php

@@ -77,7 +77,6 @@ class box_activity extends ModeleBoxes
         include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $totalMnt = 0;
         $totalnb = 0;
         $line = 0;
         $cachetime = 3600;
@@ -95,8 +94,6 @@ class box_activity extends ModeleBoxes
         // compute the year limit to show
         $tmpdate= dol_time_plus_duree(dol_now(), -1*$nbofperiod, "m");
 
-        $cumuldata = array();
-
 
         // list the summary of the propals
         if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
@@ -146,11 +143,10 @@ class box_activity extends ModeleBoxes
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	$cumuldata=array_merge($cumuldata, $data);
         	if (! empty($data))
         	{
         		$j=0;
-        		while ($line < count($cumuldata))
+        		while ($j < count($data))
         		{
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
@@ -176,7 +172,6 @@ class box_activity extends ModeleBoxes
         			'td' => 'class="right"',
         			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
         			);
-        			$totalMnt += $data[$j]->Mnttot;
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
         			'text' => $propalstatic->LibStatut($data[$j]->fk_statut,3),
@@ -231,10 +226,9 @@ class box_activity extends ModeleBoxes
                 $data = dol_readcachefile($cachedir, $filename);
             }
 
-            $cumuldata=array_merge($cumuldata, $data);
             if (! empty($data)) {
                 $j=0;
-                while ($line < count($cumuldata)) {
+                while ($j < count($data)) {
                     $this->info_box_contents[$line][0] = array(
                         'td' => 'align="left" width="16"',
                         'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=".$data[$j]->fk_statut,
@@ -259,7 +253,6 @@ class box_activity extends ModeleBoxes
                         'td' => 'class="right"',
                         'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
                     );
-                    $totalMnt += $data[$j]->Mnttot;
                     $this->info_box_contents[$line][4] = array(
                         'td' => 'align="right" width="18"',
                         'text' => $commandestatic->LibStatut($data[$j]->fk_statut,0,3),
@@ -290,11 +283,11 @@ class box_activity extends ModeleBoxes
         		$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
         		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
         		$sql.= ")";
-        		$sql.= " WHERE f.entity = ".$conf->entity;
+        		$sql.= " WHERE f.entity IN (".getEntity('facture').')';
         		if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
         		if($user->societe_id) $sql.= " AND s.rowid = ".$user->societe_id;
         		$sql.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND paye=1";
+        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=1";
         		$sql.= " GROUP BY f.fk_statut";
         		$sql.= " ORDER BY f.fk_statut DESC";
 
@@ -317,10 +310,9 @@ class box_activity extends ModeleBoxes
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	$cumuldata=array_merge($cumuldata, $data);
         	if (! empty($data)) {
         		$j=0;
-        		while ($line < count($cumuldata)) {
+        		while ($j < count($data)) {
         			$billurl="search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
@@ -347,10 +339,8 @@ class box_activity extends ModeleBoxes
         			);
 
         			// We add only for the current year
-        			if ($data[$j]->annee == date("Y")) {
+       				$totalnb += $data[$j]->nb;
-        				$totalnb += $data[$j]->nb;
+
-        				$totalMnt += $data[$j]->Mnttot;
-        			}
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
         			'text' => $facturestatic->LibStatut(1,$data[$j]->fk_statut,3),
@@ -371,12 +361,13 @@ class box_activity extends ModeleBoxes
 
         	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 
+        	$data = array();
         	if ($refresh) {
         		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
         		$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		$sql.= " WHERE f.entity = ".$conf->entity;
+        		$sql.= " WHERE f.entity IN (".getEntity('facture').')';
         		$sql.= " AND f.fk_soc = s.rowid";
-        		$sql.= " AND paye=0";
+        		$sql.= " AND f.datef >= '".$db->idate($tmpdate)."' AND f.paye=0";
         		$sql.= " GROUP BY f.fk_statut";
         		$sql.= " ORDER BY f.fk_statut DESC";
 
@@ -399,11 +390,11 @@ class box_activity extends ModeleBoxes
         		$data = dol_readcachefile($cachedir, $filename);
         	}
 
-        	$cumuldata=array_merge($cumuldata, $data);
         	if (! empty($data)) {
-        		$j=0;
+        		$alreadypaid=-1;
 
-        		while ($line < count($cumuldata)) {
+        		$j=0;
+        		while ($j < count($data)) {
         			$billurl="search_status=".$data[$j]->fk_statut."&amp;paye=0";
         			$this->info_box_contents[$line][0] = array(
         			'td' => 'align="left" width="16"',
@@ -428,10 +419,9 @@ class box_activity extends ModeleBoxes
         			'td' => 'class="right"',
         			'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency),
         			);
-        			$totalMnt += $objp->Mnttot;
         			$this->info_box_contents[$line][4] = array(
         			'td' => 'align="right" width="18"',
-        			'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3),
+        			'text' => $facturestatic->LibStatut(0,$data[$j]->fk_statut,3, $alreadypaid),
         			);
         			$line++;
         			$j++;
@@ -441,11 +431,6 @@ class box_activity extends ModeleBoxes
         			'td' => 'align="center"',
         			'text'=>$langs->trans("NoRecordedInvoices"),
         			);
-        	} else {
-        		$this->info_box_contents[0][0] = array(
-        		'td' => '',
-        		'maxlength'=>500, 'text' => ($db->error().' sql='.$sql),
-        		);
         	}
         }
 

htdocs/core/class/commoninvoice.class.php

@@ -309,7 +309,7 @@ abstract class CommonInvoice extends CommonObject
 	 *	@param    	int  	$paye          	Status field paye
 	 *	@param      int		$status        	Id status
 	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
-	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
 	 *	@param		int		$type			Type invoice
 	 *	@return     string        			Libelle du statut
 	 */

htdocs/core/class/events.class.php

@@ -48,7 +48,7 @@ class Events // extends CommonObject
 	var $dateevent;
 	var $description;
 
-	// List of all events supported by triggers
+	// List of all Audit/Security events supported by triggers
 	var $eventstolog=array(
 		array('id'=>'USER_LOGIN',             'test'=>1),
 		array('id'=>'USER_LOGIN_FAILED',      'test'=>1),

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

@@ -956,7 +956,7 @@ class Form
      */
     function select_thirdparty($selected='', $htmlname='socid', $filter='', $limit=20, $ajaxoptions=array(), $forcecombo=0)
     {
-   		return $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0,$limit);
+   		return $this->select_thirdparty_list($selected,$htmlname,$filter,1,0,$forcecombo,array(),'',0, $limit);
     }
 
     /**
@@ -1082,7 +1082,7 @@ class Form
         	$sql.=")";
         }
         $sql.=$this->db->order("nom","ASC");
-		if ($limit > 0) $sql.=$this->db->plimit($limit);
+		$sql.=$this->db->plimit($limit, 0);
 
 		// Build output string
         dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);
@@ -1966,7 +1966,7 @@ class Form
             $sql.= ' GROUP BY'.$selectFields;
         }
         $sql.= $db->order("p.ref");
-        $sql.= $db->plimit($limit);
+        $sql.= $db->plimit($limit, 0);
 
         // Build output string
         dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);
@@ -2390,7 +2390,7 @@ class Form
         	$sql.=')';
         }
         $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
-        $sql.= $db->plimit($limit);
+        $sql.= $db->plimit($limit, 0);
 
         // Build output string
 
@@ -3394,7 +3394,7 @@ class Form
                 require_once DOL_DOCUMENT_ROOT .'/compta/bank/class/account.class.php';
                 $bankstatic=new Account($this->db);
                 $bankstatic->fetch($selected);
-                print $this->textwithpicto($bankstatic->getNomUrl(1),$langs->trans("AccountCurrency").' '.$bankstatic->currency_code);
+                print $bankstatic->getNomUrl(1);
             } else {
                 print " ";
             }
@@ -5554,6 +5554,8 @@ class Form
         	print '<br><!-- showLinkedObjectBlock -->';
             print load_fiche_titre($langs->trans('RelatedObjects'), $morehtmlright, '');
 
+
+    		print '<div class="div-table-responsive-no-min">';
             print '<table class="noborder allwidth">';
 
             print '<tr class="liste_titre">';
@@ -5647,6 +5649,7 @@ class Form
         	}
 
         	print '</table>';
+			print '</div>';
 
         	return $nbofdifferenttypes;
         }

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

@@ -166,7 +166,10 @@ class FormActions
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', '', '', ($max?($max+1):0));
+        $sortfield='a.datep';
+        $sortorder='DESC';
+
+        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
 		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
 
         $num = count($listofactions);
@@ -192,19 +195,19 @@ class FormActions
         	$buttontoaddnewevent.= '</a>';
         	print load_fiche_titre($title, $buttontoaddnewevent, '');
 
-        	$page=0; $param=''; $sortfield='a.datep';
+        	$page=0; $param='';
 
         	$total = 0;
 
         	print '<div class="div-table-responsive">';
         	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
         	print '<tr class="liste_titre">';
-        	print_liste_field_titre('Ref', $_SERVER["PHP_SELF"], '', $page, $param, '');
+        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print_liste_field_titre('Action', $_SERVER["PHP_SELF"], '', $page, $param, '');
+        	print getTitleFieldOfList('Action', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print_liste_field_titre('Type', $_SERVER["PHP_SELF"], '', $page, $param, '');
+        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print_liste_field_titre('Date', $_SERVER["PHP_SELF"], '', $page, $param, 'align="center"');
+        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print_liste_field_titre('By', $_SERVER["PHP_SELF"], '', $page, $param, '');
+        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print_liste_field_titre('', $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"');
+        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
         	print '</tr>';
         	print "\n";
 
@@ -247,12 +250,10 @@ class FormActions
         		}
         		print '</td>';
         		print '<td>';
-        		if (! empty($action->author->id))
+        		if (! empty($action->userownerid))
         		{
-        			$userstatic->id = $action->author->id;
+        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
-        			$userstatic->firstname = $action->author->firstname;
+        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
-        			$userstatic->lastname = $action->author->lastname;
-        			print $userstatic->getNomUrl(1, '', 0, 0, 16, 0, '', '');
         		}
         		print '</td>';
         		print '<td align="right">';

htdocs/core/class/html.formmail.class.php

@@ -63,6 +63,7 @@ class FormMail extends Form
     var $withtoccc;
     var $withtopic;
     var $withfile;				// 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+    var $withmaindocfile;		// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
     var $withbody;
 
     var $withfromreadonly;
@@ -103,7 +104,8 @@ class FormMail extends Form
         $this->withtoccc=0;
         $this->witherrorsto=0;
         $this->withtopic=1;
-        $this->withfile=0;
+        $this->withfile=0;			// 1=Add section "Attached files". 2=Can add files.
+        $this->withmaindocfile=0;	// 1=Add a checkbox "Attach also main document" for mass actions (checked by default), -1=Add checkbox (not checked by default)
         $this->withbody=1;
 
         $this->withfromreadonly=1;
@@ -220,6 +222,7 @@ class FormMail extends Form
     /**
      *	Show the form to input an email
      *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+     *  this->withmaindocfile
      *
      *	@param	string	$addfileaction		Name of action when posting file attachments
      *	@param	string	$removefileaction	Name of action when removing file attachments
@@ -233,6 +236,7 @@ class FormMail extends Form
     /**
      *	Get the form to input an email
      *  this->withfile: 0=No attaches files, 1=Show attached files, 2=Can add new attached files
+     *  this->withfile
      *  this->param:	Contains more parameteres like email templates info
      *
      *	@param	string	$addfileaction		Name of action when posting file attachments
@@ -296,16 +300,25 @@ class FormMail extends Form
         	}
         	$arraydefaultmessage=$this->getEMailTemplate($this->db, $this->param["models"], $user, $outputlangs, $model_id);
 			//var_dump($this->param["models"]);
+        	//var_dump($model_id);
         	//var_dump($arraydefaultmessage);
 
-        	$out.= "\n".'<!-- Begin form mail --><div id="mailformdiv"></div>'."\n";
+        	$out.= "\n".'<!-- Begin form mail type='.$this->param["models"].' --><div id="mailformdiv"></div>'."\n";
         	if ($this->withform == 1)
         	{
         		$out.= '<form method="POST" name="mailform" id="mailform" enctype="multipart/form-data" action="'.$this->param["returnurl"].'#formmail">'."\n";
-				$out.= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
+        		$out.= '<a id="formmail" name="formmail"></a>';
+        		$out.= '<input style="display:none" type="submit" id="sendmail" name="sendmail">';
         		$out.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
         		$out.= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
-        		$out.= '<a id="formmail" name="formmail"></a>';
+        	}
+        	if (! empty($this->withfrom))
+        	{
+        		if (! empty($this->withfromreadonly))
+        		{
+        			$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+        			$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
+        		}
         	}
         	foreach ($this->param as $key=>$value)
         	{
@@ -330,7 +343,7 @@ class FormMail extends Form
         	if (count($modelmail_array)>0)
         	{
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-        	    $out.= $langs->trans('SelectMailModel').': '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1);
+        	    $out.= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 	        	if ($user->admin) $out.= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')),1);
 	        	$out.= ' &nbsp; ';
 	        	$out.= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
@@ -340,7 +353,7 @@ class FormMail extends Form
         	elseif (! empty($this->param['models']) && in_array($this->param['models'], array(
         	        'propal_send','order_send','facture_send',
         	        'shipping_send','fichinter_send','supplier_proposal_send','order_supplier_send',
-        	        'invoice_supplier_send','thirdparty','all'
+        	        'invoice_supplier_send','thirdparty','contract','all'
            	    )))
         	{
 	        	$out.= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
@@ -357,16 +370,19 @@ class FormMail extends Form
         	$out.= '<table class="border" width="100%">'."\n";
 
         	// Substitution array
-        	if (! empty($this->withsubstit))
+        	if (! empty($this->withsubstit))		// Unset of set ->withsubstit=0 to disable this.
         	{
-        		$out.= '<tr><td colspan="2">';
+        		$out.= '<tr><td colspan="2" align="right">';
+        		//$out.='<div class="floatright">';
         		$help="";
         		foreach($this->substit as $key => $val)
         		{
-        			$help.=$key.' -> '.$langs->trans($val).'<br>';
+        			$help.=$key.' -> '.$langs->trans(dol_string_nohtmltag($val)).'<br>';
         		}
-        		$out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $help);
+        		if (is_numeric($this->withsubstit)) $out.= $form->textwithpicto($langs->trans("EMailTestSubstitutionReplacedByGenericValues"), $help, 1, 'help', '', 0, 2, 'substittooltip');	// Old usage
+        		else $out.= $form->textwithpicto($langs->trans('AvailableVariables'), $help, 1, 'help', '', 0, 2, 'substittooltip');															// New usage
         		$out.= "</td></tr>\n";
+        		//$out.='</div>';
         	}
 
         	// From
@@ -374,9 +390,7 @@ class FormMail extends Form
         	{
         		if (! empty($this->withfromreadonly))
         		{
-        			$out.= '<input type="hidden" id="fromname" name="fromname" value="'.$this->fromname.'" />';
+        			$out.= '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td>';
-        			$out.= '<input type="hidden" id="frommail" name="frommail" value="'.$this->frommail.'" />';
-        			$out.= '<tr><td width="180" class="fieldrequired">'.$langs->trans("MailFrom").'</td><td>';
 
                     if (! ($this->fromtype === 'user' && $this->fromid > 0)
                         && ! ($this->fromtype === 'company')
@@ -429,10 +443,10 @@ class FormMail extends Form
                             }
                         }
                         $out.= ' '.$form->selectarray('fromtype', $liste, $this->fromtype, 0, 0, 0, '', 0, 0, 0, '', '', 0, '', $disablebademails);
+                        //$out.= ajax_combobox('fromtype');
                     }
 
         			$out.= "</td></tr>\n";
-        			$out.= "</td></tr>\n";
         		}
         		else
         		{
@@ -499,7 +513,7 @@ class FormMail extends Form
         				{
         				    $tmparray[$key]=dol_htmlentities($tmparray[$key], null, 'UTF-8', true);
         				}
-        				$withtoselected=GETPOST("receiver");     // Array of selected value
+        				$withtoselected=GETPOST("receiver",'none');     // Array of selected value
         				if (empty($withtoselected) && count($tmparray) == 1 && GETPOST('action','aZ09') == 'presend')
         				{
         				    $withtoselected = array_keys($tmparray);
@@ -632,9 +646,12 @@ class FormMail extends Form
         	// Topic
         	if (! empty($this->withtopic))
         	{
-        		$defaulttopic="";
+        		$defaulttopic=GETPOST('subject','none');
-        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['topic']) $defaulttopic=$arraydefaultmessage['topic'];
+				if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1')
-        		elseif (! is_numeric($this->withtopic))	 $defaulttopic=$this->withtopic;
+				{
+        			if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['topic']) $defaulttopic=$arraydefaultmessage['topic'];
+        			elseif (! is_numeric($this->withtopic))	 $defaulttopic=$this->withtopic;
+				}
 
         		$defaulttopic=make_substitutions($defaulttopic,$this->substit);
 
@@ -660,9 +677,22 @@ class FormMail extends Form
         		$out.= '<td width="180">'.$langs->trans("MailFile").'</td>';
 
         		$out.= '<td>';
+        		if (! empty($this->withmaindocfile))
+        		{
+        			if ($this->withmaindocfile == 1)
+        			{
+        				$out.='<input type="checkbox" name="addmaindocfile" value="1" />';
+        			}
+        			if ($this->withmaindocfile == -1)
+        			{
+        				$out.='<input type="checkbox" name="addmaindocfile" checked="checked" />';
+        			}
+        			$out.=' '.$langs->trans("JoinMainDoc").'.<br>';
+        		}
+
         		if (is_numeric($this->withfile))
         		{
-	        		// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
+					// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
 	        		$out.= '<input type="hidden" class="removedfilehidden" name="removedfile" value="">'."\n";
 	        		$out.= '<script type="text/javascript" language="javascript">';
 	        		$out.= 'jQuery(document).ready(function () {';
@@ -685,7 +715,7 @@ class FormMail extends Form
 	        				$out.= '<br></div>';
 	        			}
 	        		}
-	        		else
+	        		else if (empty($this->withmaindocfile))		// Do not show message if we asked to show the checkbox
 	        		{
 	        			$out.= $langs->trans("NoAttachedFiles").'<br>';
 	        		}
@@ -701,35 +731,46 @@ class FormMail extends Form
         		{
         			$out.=$this->withfile;
         		}
+
         		$out.= "</td></tr>\n";
         	}
 
         	// Message
         	if (! empty($this->withbody))
         	{
-        		$defaultmessage="";
+        		$defaultmessage=GETPOST('message','none');
-        		if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) $defaultmessage=$arraydefaultmessage['content'];
+				if (! GETPOST('modelselected','alpha') || GETPOST('modelmailselected') != '-1')
-        		elseif (! is_numeric($this->withbody))	$defaultmessage=$this->withbody;
+				{
+					if (count($arraydefaultmessage) > 0 && $arraydefaultmessage['content']) $defaultmessage=$arraydefaultmessage['content'];
+       				elseif (! is_numeric($this->withbody))	$defaultmessage=$this->withbody;
+				}
 
         		// Complete substitution array
-        		if (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
+        		$paymenturl='';
+        		if (! empty($conf->global->PAYMENT_ADD_PAYMENT_URL)		// Option to enable to add online link into __PERSONALIZED__
+        			|| (! empty($conf->paypal->enabled) && ! empty($conf->global->PAYPAL_ADD_PAYMENT_URL))
+        		)
         		{
-        			require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+        			if (empty($this->substit['__REF__']))
-
-        			$langs->load('paypal');
-
-        			// Set the paypal message and url link into __PERSONALIZED__ key
-        			if ($this->param["models"]=='order_send')
         			{
-        				$url=getPaypalPaymentUrl(0,'order',$this->substit['__ORDERREF__']?$this->substit['__ORDERREF__']:$this->substit['__REF__']);
+        				//$paymenturl='LinkToPayOnlineNotAvailableInThisContext';
-        				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
+        				$paymenturl='';
         			}
-        			if ($this->param["models"]=='facture_send')
+        			else
         			{
-        				$url=getPaypalPaymentUrl(0,'invoice',$this->substit['__REF__']);
+	        			// Set the online payment message and url link into __PERSONALIZED__ key
-        				$this->substit['__PERSONALIZED__']=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
+	        			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+	        			$langs->load('paypal');
+	        			$typeforonlinepayment='free';
+	        			if ($this->param["models"]=='order_send')   $typeforonlinepayment='order';		// TODO use detection on something else than template
+	        			if ($this->param["models"]=='facture_send') $typeforonlinepayment='invoice';	// TODO use detection on something else than template
+	       				$url=getOnlinePaymentUrl(0, $typeforonlinepayment, $this->substit['__REF__']);
+	       				//$paymenturl=str_replace('\n',"\n",$langs->transnoentitiesnoconv("PredefinedMailContentLink",$url));
+	       				$paymenturl=$url;
         			}
         		}
+        		$this->substit['__PERSONALIZED__']=$paymenturl;
+        		$this->substit['__ONLINE_PAYMENT_URL__']='YY'.$paymenturl;
 
                 //Add lines substitution key from each line
                 $lines = '';
@@ -815,7 +856,7 @@ class FormMail extends Form
         	{
 	        	$out.= '<script type="text/javascript" language="javascript">';
 		        $out.= 'jQuery(document).ready(function () {';
-				$out.= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is calle at every key pressed ! */
+				$out.= '	$(document).on("keypress", \'#mailform\', function (e) {		/* Note this is called at every key pressed ! */
 	    						var code = e.keyCode || e.which;
 	    						if (code == 13) {
 	        						e.preventDefault();
@@ -835,11 +876,11 @@ class FormMail extends Form
 
 
 	/**
-	 *      Return template of email
+	 *      Return templates of email with type = $type_template or type = 'all'
-	 *      Search into table c_email_templates
+	 *      This search into table c_email_templates.
 	 *
 	 * 		@param	DoliDB		$db				Database handler
-	 * 		@param	string		$type_template	Get message for key module
+	 * 		@param	string		$type_template	Get message for type=$type_template, type='all' also included.
 	 *      @param	string		$user			Use template public or limited to this user
 	 *      @param	Translate	$outputlangs	Output lang object
 	 *      @param	int			$id				Id template to find
@@ -852,9 +893,9 @@ class FormMail extends Form
 
 		$sql = "SELECT label, topic, content, content_lines, lang";
 		$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
-		$sql.= " WHERE type_template='".$db->escape($type_template)."'";
+		$sql.= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
 		$sql.= " AND entity IN (".getEntity('c_email_templates', 0).")";
-		$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
+		$sql.= " AND (private = 0 OR fk_user = ".$user->id.")";				// Get all public or private owned
 		if ($active >= 0) $sql.=" AND active = ".$active;
 		if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
 		if (!empty($id)) $sql.= " AND rowid=".$id;
@@ -873,7 +914,7 @@ class FormMail extends Form
 				$ret['content_lines']=$obj->content_lines;
 				$ret['lang']=$obj->lang;
 			}
-			else
+			else								// If there is no template at all
 			{
 				$defaultmessage='';
 				if     ($type_template=='facture_send')	            { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendInvoice"); }
@@ -997,17 +1038,19 @@ class FormMail extends Form
 
 
 	/**
-	 * Set substit array from object
+	 * Set substit array from object. This is call when suggesting the email template into forms to send email.
+	 * TODO Replace with getCommonSubstitutionArray with param onlykey = 2
 	 *
-	 * @param	CommonObject	   $object		  Object to use
+	 * @param	CommonObject	$object		   Object to use
-	 * @param   Translate  $outputlangs   Object lang
+	 * @param   Translate  		$outputlangs   Object lang
 	 * @return	void
+	 * @see getCommonSubstitutionArray
 	 */
 	function setSubstitFromObject($object, $outputlangs=null)
 	{
 		global $conf, $user;
 		$this->substit['__REF__'] = $object->ref;
-		$this->substit['__REFCLIENT__'] = isset($object->ref_client) ? $object->ref_client : '';
+		$this->substit['__REFCLIENT__'] = isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : '');
 		$this->substit['__REFSUPPLIER__'] = isset($object->ref_supplier) ? $object->ref_supplier : '';
 
 		$this->substit['__DATE_YMD__'] = isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '';
@@ -1027,7 +1070,7 @@ class FormMail extends Form
 		$this->substit['__PERSONALIZED__'] = '';
 		$this->substit['__CONTACTCIVNAME__'] = '';	// Will be replace just before sending
 
-        // Create dinamic tags for __EXTRAFIELD_FIELD__
+        // Create dynamic tags for __EXTRAFIELD_FIELD__
         $extrafields = new ExtraFields($this->db);
         $extralabels = $extrafields->fetch_name_optionals_label($object->table_element, true);
         $object->fetch_optionals($object->id, $extralabels);
@@ -1035,7 +1078,7 @@ class FormMail extends Form
             $this->substit['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
         }
 
-        //Fill substit_lines with each object lines content
+        // Fill substit_lines with each object lines content
         if (is_array($object->lines))
         {
             foreach ($object->lines as $line)
@@ -1073,13 +1116,14 @@ class FormMail extends Form
 	}
 
 	/**
-	 * Get list of substition keys available for emails.
+	 * Get list of substitution keys available for emails. This is used for tooltips help.
-	 * This include the complete_substitutions_array. TODO Include the getCommonSubstitutionArray().
+	 * This include the complete_substitutions_array.
 	 *
 	 * @param	string	$mode		'formemail', 'formemailwithlines', 'formemailforlines', 'emailing', ...
+	 * @param	Object	$object		Object if applicable
 	 * @return	array               Array of substitution values for emails.
 	 */
-	static function getAvailableSubstitKey($mode='formemail')
+	static function getAvailableSubstitKey($mode='formemail', $object=null)
 	{
 		global $conf, $langs;
 
@@ -1088,20 +1132,20 @@ class FormMail extends Form
 		if ($mode == 'formemail' || $mode == 'formemailwithlines' || $mode == 'formemailforlines')
 		{
 			$vars=array(
-				'__REF__',
+				'__REF__'=>'__REF__',
-				'__REFCLIENT__',
+				'__REFCLIENT__'=>'__REFCLIENT__',
-				'__REFSUPPLIER__',
+				'__REFSUPPLIER__'=>'__REFSUPPLIER__',
-			    '__THIRDPARTY_ID__',
+			    '__THIRDPARTY_ID__'=>'__THIRDPARTY_ID__',
-			    '__THIRDPARTY_NAME__',
+			    '__THIRDPARTY_NAME__'=>'__THIRDPARTY_NAME__',
-			    '__PROJECT_ID__',
+			    '__PROJECT_ID__'=>'__PROJECT_ID__',
-			    '__PROJECT_REF__',
+			    '__PROJECT_REF__'=>'__PROJECT_REF__',
-			    '__PROJECT_NAME__',
+			    '__PROJECT_NAME__'=>'__PROJECT_NAME__',
-				'__CONTACTCIVNAME__',
+				'__CONTACTCIVNAME__'=>'__CONTACTCIVNAME__',
-				'__AMOUNT__',
+				'__AMOUNT__'=>'__AMOUNT__',
-				'__AMOUNT_WO_TAX__',
+				'__AMOUNT_WO_TAX__'=>'__AMOUNT_WO_TAX__',
-				'__AMOUNT_VAT__',
+				'__AMOUNT_VAT__'=>'__AMOUNT_VAT__',
-			    '__PERSONALIZED__',			// Paypal link will be added here in form mode
+			    '__PERSONALIZED__'=>'__PERSONALIZED__',				// Paypal link will be added here in form mode
-				'__SIGNATURE__',
+				'__SIGNATURE__'=>'__SIGNATURE__',
 			);
 			if ($mode == 'formwithlines')
 			{
@@ -1179,7 +1223,7 @@ class FormMail extends Form
 		}
 
 		$parameters=array('mode'=>$mode);
-		$tmparray=getCommonSubstitutionArray($langs);
+		$tmparray=getCommonSubstitutionArray($langs, 2, null, $object);
 		complete_substitutions_array($tmparray, $langs, null, $parameters);
 		foreach($tmparray as $key => $val)
 		{

htdocs/core/class/html.formsms.class.php

@@ -130,7 +130,7 @@ function limitChars(textarea, limit, infodiv)
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if ($this->withsubstit)
+        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
             $help="";

htdocs/core/lib/agenda.lib.php

@@ -142,7 +142,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
 		print $langs->trans("Status");
 		print ' &nbsp;</td><td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
-		$formactions->form_select_status_action('formaction',$status,1,'status',1,2);
+		$formactions->form_select_status_action('formaction', $status, 1, 'status', 1, 2, 'minwidth100');
 		print '</td></tr>';
 	}
 

htdocs/core/lib/company.lib.php

@@ -618,7 +618,7 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
                 $projecttmp = new Project($db);
 
                 $i=0;
-                $var=true;
+
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($result);
@@ -629,7 +629,6 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
 
                     if ($user->rights->projet->lire && $userAccess > 0)
                     {
-                        $var = !$var;
                         print '<tr class="oddeven">';
 
                         // Ref
@@ -665,7 +664,6 @@ function show_projects($conf, $langs, $db, $object, $backtopage='', $nocreatelin
             }
             else
 			{
-                $var = false;
             	print '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
             }
             $db->free($result);
@@ -712,6 +710,14 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     if (! $sortorder) $sortorder="ASC";
     if (! $sortfield) $sortfield="p.lastname";
 
+    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
+    {
+    	$search_status		 = '';
+    	$search_name         = '';
+    	$search_addressphone = '';
+    	$search_array_options=array();
+    }
+
     $i=-1;
 
     $contactstatic = new Contact($db);
@@ -741,29 +747,14 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
 
+
+	print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
     print "\n".'<table class="noborder" width="100%">'."\n";
 
     $param="socid=".$object->id;
     if ($search_status != '') $param.='&amp;search_status='.$search_status;
     if ($search_name != '') $param.='&amp;search_name='.urlencode($search_name);
 
-    $colspan=9;
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Name",$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Poste",$_SERVER["PHP_SELF"],"p.poste","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre( $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email"),$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"p.statut","",$param,'',$sortfield,$sortorder);
-    // Add to agenda
-    if (! empty($conf->agenda->enabled) && ! empty($user->rights->agenda->myactions->create))
-    {
-    	$colspan++;
-        print_liste_field_titre('');
-    }
-    // Edit
-    print_liste_field_titre('');
-	print "</tr>\n";
-
-
     $sql = "SELECT p.rowid, p.lastname, p.firstname, p.fk_pays as country_id, p.civility, p.poste, p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.email, p.skype, p.statut, p.photo,";
     $sql .= " p.civility as civility_id, p.address, p.zip, p.town";
     $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
@@ -778,43 +769,59 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
 
     $num = $db->num_rows($result);
 
-	$var=true;
+    $colspan=9;
+
+    if ($num || (GETPOST('button_search','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search_x','alpha')))
+    {
+    	print '<tr class="liste_titre">';
+
+    	// Photo - Name
+    	print '<td class="liste_titre">';
+    	print '<input type="text" class="flat minwidth75" name="search_name" value="'.dol_escape_htmltag($search_name).'">';
+    	print '</td>';
+
+    	// Position
+    	print '<td class="liste_titre">';
+    	print '</td>';
+
+    	// Address - Phone - Email
+    	print '<td class="liste_titre"></td>';
+
+    	// Status
+    	print '<td class="liste_titre maxwidthonsmartphone">';
+    	print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status);
+    	print '</td>';
+
+    	// Add to agenda
+    	if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
+    	{
+    		$colspan++;
+    		print '<td class="liste_titre"></td>';
+    	}
+
+    	// Action
+		print '<td class="liste_titre" align="right">';
+		$searchpicto=$form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+
+    	print "</tr>";
+    }
+
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Name",$_SERVER["PHP_SELF"],"p.lastname","",$param,'',$sortfield,$sortorder);
+    print_liste_field_titre("Poste",$_SERVER["PHP_SELF"],"p.poste","",$param,'',$sortfield,$sortorder);
+    print_liste_field_titre( $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email"),$_SERVER["PHP_SELF"],"","",$param,'',$sortfield,$sortorder);
+    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"p.statut","",$param,'',$sortfield,$sortorder);
+    // Add to agenda
+    if (! empty($conf->agenda->enabled) && ! empty($user->rights->agenda->myactions->create)) print_liste_field_titre('');
+    // Edit
+    print_liste_field_titre('');
+    print "</tr>\n";
+
 	if ($num || (GETPOST('button_search') || GETPOST('button_search.x') || GETPOST('button_search_x')))
     {
-        print '<tr class="liste_titre">';
+    	$i=0;
-
-        // Photo - Name
-        print '<td class="liste_titre">';
-        print '<input type="text" class="flat" name="search_name" size="20" value="'.$search_name.'">';
-        print '</td>';
-
-        // Position
-        print '<td class="liste_titre">';
-        print '</td>';
-
-        // Address - Phone - Email
-        print '<td class="liste_titre">&nbsp;</td>';
-
-        // Status
-        print '<td class="liste_titre maxwidthonsmartphone">';
-        print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0,1),'1'=>$contactstatic->LibStatut(1,1)),$search_status);
-        print '</td>';
-
-        // Add to agenda
-        if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-        {
-        	$colspan++;
-            print '<td class="liste_titre">&nbsp;</td>';
-        }
-
-    	// Edit
-        print '<td class="liste_titre" align="right">';
-        print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
-        print '</td>';
-
-        print "</tr>";
-
-        $i=0;
 
         while ($i < $num)
         {
@@ -890,11 +897,12 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
     }
     else
 	{
-        print "<tr ".$bc[! $var].">";
+        print '<tr class="oddeven">';
         print '<td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td>';
         print "</tr>\n";
     }
     print "\n</table>\n";
+	print '</div>';
 
     print '</form>'."\n";
 
@@ -943,12 +951,8 @@ function show_addresses($conf,$langs,$db,$object,$backtopage='')
 
 	if ($num > 0)
 	{
-		$var=true;
-
 		foreach ($addressstatic->lines as $address)
 		{
-			$var = !$var;
-
 			print '<tr class="oddeven">';
 
 			print '<td>';
@@ -1115,7 +1119,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         {
             $i = 0 ;
             $num = $db->num_rows($resql);
-            $var=true;
+
             while ($i < $num)
             {
                 $obj = $db->fetch_object($resql);
@@ -1162,7 +1166,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         }
     }
 
-    // Add also event from emailings. FIXME This should be replaced by an automatic event
+    // Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
     if (! empty($conf->mailing->enabled) && ! empty($objcon->email))
     {
         $langs->load("mails");
@@ -1183,7 +1187,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
         {
             $i = 0 ;
             $num = $db->num_rows($resql);
-            $var=true;
+
             while ($i < $num)
             {
                 $obj = $db->fetch_object($resql);
@@ -1304,7 +1308,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
 
 			$actionstatic->fetch($histo[$key]['id']);    // TODO Do we need this, we already have a lot of data of line into $histo
 
-            $out.="<tr ".$bc[$var].">";
+            $out.='<tr class="oddeven">';
 
             // Done or todo
             if ($donetodo)
@@ -1446,7 +1450,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint=
             }
 
             // Status
-            $out.='<td class="nowrap" align="center">'.$actionstatic->LibStatut($histo[$key]['percent'],3,1,$histo[$key]['datestart']).'</td>';
+            $out.='<td class="nowrap" align="center">'.$actionstatic->LibStatut($histo[$key]['percent'],3,0,$histo[$key]['datestart']).'</td>';
 
             // Actions
             $out.='<td></td>';
@@ -1503,12 +1507,10 @@ function show_subsidiaries($conf,$langs,$db,$object)
 		print "</tr>";
 
 		$i=0;
-		$var=true;
 
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($result);
-			$var = !$var;
 
 			print '<tr class="oddeven">';
 

htdocs/core/lib/files.lib.php

@@ -2283,6 +2283,14 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	    }
 	    $original_file=$conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	}
+	else if ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
+	{
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i',$original_file))
+		{
+			$accessallowed=1;
+		}
+		$original_file=$conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
+	}
 
 	// Wrapping for interventions
 	else if (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))

htdocs/core/lib/functions.lib.php

@@ -3356,16 +3356,16 @@ function dol_print_error_email($prefixcode, $errormessage='')
  *	@param	string	$field       Field to use for new sorting
  *	@param	string	$begin       ("" by defaut)
  *	@param	string	$moreparam   Add more parameters on sort url links ("" by default)
- *	@param  string	$td          Options of attribute td ("" by defaut, example: 'align="center"')
+ *	@param  string	$moreattrib  Options of attribute td ("" by defaut, example: 'align="center"')
  *	@param  string	$sortfield   Current field used to sort
  *	@param  string	$sortorder   Current sort order
  *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
  *  @param	string	$tooltip	 Tooltip
  *	@return	void
  */
-function print_liste_field_titre($name, $file="", $field="", $begin="", $moreparam="", $td="", $sortfield="", $sortorder="", $prefix="", $tooltip="")
+function print_liste_field_titre($name, $file="", $field="", $begin="", $moreparam="", $moreattrib="", $sortfield="", $sortorder="", $prefix="", $tooltip="")
 {
-	print getTitleFieldOfList($name, 0, $file, $field, $begin, $moreparam, $td, $sortfield, $sortorder, $prefix, 0, $tooltip);
+	print getTitleFieldOfList($name, 0, $file, $field, $begin, $moreparam, $moreattrib, $sortfield, $sortorder, $prefix, 0, $tooltip);
 }
 
 /**
@@ -3417,13 +3417,13 @@ function getTitleFieldOfList($name, $thead=0, $file="", $field="", $begin="", $m
 
 		if ($field1 != $sortfield1) // We are on another field
 		{
-            if (preg_match('/^DESC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
+            if (preg_match('/^DESC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">';
-            else $out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
+            else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 		else                      // We are of first sorting criteria
 		{
-            if (preg_match('/^ASC/', $sortorder)) $out.= '<a href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
+            if (preg_match('/^ASC/', $sortorder)) $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=desc&begin='.$begin.$options.'">';
-		    else $out.= '<a href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
+		    else $out.= '<a class="reposition" href="'.$file.'?sortfield='.$sortfield.'&sortorder=asc&begin='.$begin.$options.'">';
 		}
 	}
 
@@ -4826,20 +4826,25 @@ function picto_required()
 
 
 /**
- *	Clean a string from all HTML tags and entities
+ *	Clean a string from all HTML tags and entities.
+ *  This function differs from strip_tags because:
+ *  - <br> are replace with \n
+ *  - if entities are found, they are decoded before the strip
+ *  - you can decide to convert line feed into spaces
  *
- *	@param	string	$StringHtml			String to clean
+ *	@param	string	$stringtoclean		String to clean
  *	@param	integer	$removelinefeed		1=Replace also new lines by a space, 0=Only last one are removed
  *  @param  string	$pagecodeto      	Encoding of input/output string
  *	@return string	    				String cleaned
  *
- * 	@see		dol_escape_htmltag
+ * 	@see	dol_escape_htmltag strip_tags
  */
-function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
+function dol_string_nohtmltag($stringtoclean,$removelinefeed=1,$pagecodeto='UTF-8')
 {
+	// TODO Try to replace with strip_tags($stringtoclean)
 	$pattern = "/<[^<>]+>/";
-	$StringHtml = preg_replace('/<br[^>]*>/', "\n", $StringHtml);
+	$stringtoclean = preg_replace('/<br[^>]*>/', "\n", $stringtoclean);
-	$temp = dol_html_entity_decode($StringHtml,ENT_COMPAT,$pagecodeto);
+	$temp = dol_html_entity_decode($stringtoclean,ENT_COMPAT,$pagecodeto);
 
     // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
     $temp = preg_replace($pattern,"",$temp);    // pass 1
@@ -4855,8 +4860,8 @@ function dol_string_nohtmltag($StringHtml,$removelinefeed=1,$pagecodeto='UTF-8')
 	{
 		$temp = str_replace("  "," ",$temp);
 	}
-	$CleanString = trim($temp);
+
-	return $CleanString;
+	return trim($temp);
 }
 
 
@@ -5189,25 +5194,32 @@ function dol_concatdesc($text1,$text2,$forxml=false)
 
 
 /**
- * Return array of possible common substitutions.
+ * Return array of possible common substitutions. This includes several families like: 'system', 'mycompany', 'object', 'objectamount', 'date', 'user'
  *
  * @param	Translate	$outputlangs	Output language
- * @param   int         $onlykey        Do not calculate heavy values of keys (performance enhancement when we need only the keys)
+ * @param   int         $onlykey        1=Do not calculate some heavy values of keys (performance enhancement when we need only the keys), 2=Values are trunc and html sanitized (to use for help tooltip)
- * @param   array       $exclude        Array of family keys we want to exclude. For example array('mycompany', 'objectamount', 'date', 'user', ...)
+ * @param   array       $exclude        Array of family keys we want to exclude. For example array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...)
  * @param   Object      $object         Object for keys on object
  * @return	array						Array of substitutions
+ * @see setSubstitFromObject
  */
 function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $object=null)
 {
-    global $conf, $mysoc, $user;
+    global $db, $conf, $mysoc, $user;
 
     $substitutionarray=array();
 
+    if (empty($exclude) || ! in_array('system', $exclude))
+    {
+    	$substitutionarray=array_merge($substitutionarray, array(
+    		'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT
+    	));
+    }
     if (empty($exclude) || ! in_array('mycompany', $exclude))
     {
         $substitutionarray=array_merge($substitutionarray, array(
-            '__MYCOMPANY_NAME__' => $mysoc->name,
+            '__MYCOMPANY_NAME__'    => $mysoc->name,
-            '__MYCOMPANY_EMAIL__' => $mysoc->email,
+            '__MYCOMPANY_EMAIL__'   => $mysoc->email,
             '__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
             '__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
             '__MYCOMPANY_PROFID3__' => $mysoc->idprof3,
@@ -5218,17 +5230,53 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__MYCOMPANY_COUNTRY_ID__' => $mysoc->country_id
         ));
     }
+    if (is_object($object) && (empty($exclude) || ! in_array('object', $exclude)))
+    {
+	    $substitutionarray['__ID__'] = $object->id;
+    	$substitutionarray['__REF__'] = $object->ref;
+    	$substitutionarray['__REFCLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : ''));
+    	$substitutionarray['__REFSUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : '');
+
+    	if (is_object($object->thirdparty) && $object->thirdparty->id > 0)
+    	{
+    		$substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:'');
+    		$substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:'');
+    	}
+
+    	if (is_object($object->projet) && $object->projet->id > 0)
+    	{
+    		$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet)?$object->projet->id:'');
+    		$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:'');
+    		$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet)?$object->projet->title:'');
+    	}
+
+    	// Create dynamic tags for __EXTRAFIELD_FIELD__
+    	if ($object->table_element && $object->id > 0)
+    	{
+	    	$extrafieldstmp = new ExtraFields($db);
+	    	$extralabels = $extrafieldstmp->fetch_name_optionals_label($object->table_element, true);
+	    	$object->fetch_optionals($object->id, $extralabels);
+	    	foreach ($extrafieldstmp->attribute_label as $key => $label) {
+	    		$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+	    	}
+    	}
+
+    	$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'LinkToPayOnlineIfApplicable';
+    }
     if (empty($exclude) || ! in_array('objectamount', $exclude))
     {
-        if (is_object($object))       // For backward compatibility
+		$substitutionarray['__DATE_YMD__'] = is_object($object)?(isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : '') : '';
+		$substitutionarray['__DATE_DUE_YMD__'] = is_object($object)?(isset($object->date_lim_reglement)? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : '') : '';
+    	$substitutionarray['__AMOUNT__']       = is_object($object)?$object->total_ttc:'';
+        $substitutionarray['__AMOUNT_WO_TAX__']= is_object($object)?$object->total_ht:'';
+        $substitutionarray['__AMOUNT_VAT__']   = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+        // For backward compatibility
+        if ($onlykey != 2)
         {
-            $substitutionarray['__TOTAL_TTC__']    =is_object($object)?$object->total_ttc:'';
+        	$substitutionarray['__TOTAL_TTC__']    = is_object($object)?$object->total_ttc:'';
-            $substitutionarray['__TOTAL_HT__']     =is_object($object)?$object->total_ht:'';
+        	$substitutionarray['__TOTAL_HT__']     = is_object($object)?$object->total_ht:'';
-            $substitutionarray['__TOTAL_VAT__']    =is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
+        	$substitutionarray['__TOTAL_VAT__']    = is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
         }
-        $substitutionarray['__AMOUNT__']       =is_object($object)?$object->total_ttc:'';
-        $substitutionarray['__AMOUNT_WO_TAX__']=is_object($object)?$object->total_ht:'';
-        $substitutionarray['__AMOUNT_VAT__']   =is_object($object)?($object->total_vat?$object->total_vat:$object->total_tva):'';
     }
 
     if (empty($exclude) || ! in_array('date', $exclude))
@@ -5268,7 +5316,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
             '__USER_LASTNAME__' => $user->lastname,
             '__USER_FIRSTNAME__' => $user->firstname,
             '__USER_FULLNAME__' => $user->getFullName($outputlangs),
-            '__USER_SUPERVISOR_ID__' => $user->fk_user
+            '__USER_SUPERVISOR_ID__' => $user->fk_user,
+        	'__SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : '')
         ));
     }
     if (! empty($conf->multicompany->enabled))

htdocs/core/lib/payments.lib.php

@@ -117,11 +117,11 @@ function showOnlinePaymentUrl($type,$ref)
  * @param   int		$mode		0=True url, 1=Url formated with colors
  * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
  * @param	string	$ref		Ref of object
- * @param	int		$amount		Amount
+ * @param	int		$amount		Amount (required for $type='free' only)
  * @param	string	$freetag	Free tag
  * @return	string				Url string
  */
-function getOnlinePaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
+function getOnlinePaymentUrl($mode, $type, $ref='', $amount='9.99', $freetag='your_free_tag')
 {
 	global $conf;
 

htdocs/core/lib/product.lib.php

@@ -309,7 +309,7 @@ function show_stats_for_company($product,$socid)
 	print '<td align="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
 	print '</tr>';
 
-	// Propals
+	// Customer proposals
 	if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
 		$nblines++;
@@ -327,7 +327,25 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Commandes clients
+	// Supplier proposals
+	if (! empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
+	{
+		$nblines++;
+		$ret=$product->load_stats_proposal_supplier($socid);
+		if ($ret < 0) dol_print_error($db);
+		$langs->load("propal");
+		print '<tr><td>';
+		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
+		print '</td><td align="right">';
+		print $product->stats_proposal_supplier['suppliers'];
+		print '</td><td align="right">';
+		print $product->stats_proposal_supplier['nb'];
+		print '</td><td align="right">';
+		print $product->stats_proposal_supplier['qty'];
+		print '</td>';
+		print '</tr>';
+	}
+	// Customer orders
 	if (! empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
 		$nblines++;
@@ -345,7 +363,7 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Commandes fournisseurs
+	// Supplier orders
 	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->commande->lire)
 	{
 		$nblines++;
@@ -363,25 +381,7 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Contrats
+	// Customer invoices
-	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-	{
-		$nblines++;
-		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("contracts");
-		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
-		print '</td><td align="right">';
-		print $product->stats_contrat['customers'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['nb'];
-		print '</td><td align="right">';
-		print $product->stats_contrat['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Factures clients
 	if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		$nblines++;
@@ -399,7 +399,7 @@ function show_stats_for_company($product,$socid)
 		print '</td>';
 		print '</tr>';
 	}
-	// Factures fournisseurs
+	// Supplier invoices
 	if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
 	{
 		$nblines++;
@@ -418,6 +418,25 @@ function show_stats_for_company($product,$socid)
 		print '</tr>';
 	}
 
+	// Contracts
+	if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
+	{
+		$nblines++;
+		$ret=$product->load_stats_contrat($socid);
+		if ($ret < 0) dol_print_error($db);
+		$langs->load("contracts");
+		print '<tr><td>';
+		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
+		print '</td><td align="right">';
+		print $product->stats_contrat['customers'];
+		print '</td><td align="right">';
+		print $product->stats_contrat['nb'];
+		print '</td><td align="right">';
+		print $product->stats_contrat['qty'];
+		print '</td>';
+		print '</tr>';
+	}
+
 	return $nblines++;
 }
 

htdocs/core/menus/standard/eldy.lib.php

@@ -288,7 +288,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 		{
 		    // url = url from host, shorturl = relative path into dolibarr sources
 			$url = $shorturl = $newTabMenu[$i]['url'];
-			if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))
+			if (! preg_match("/^(http:\/\/|https:\/\/)/i",$newTabMenu[$i]['url']))	// Do not change url content for external links
 			{
 				$tmp=explode('?',$newTabMenu[$i]['url'],2);
 				$url = $shorturl = $tmp[0];
@@ -323,7 +323,7 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0,$mode
 	foreach($menu->liste as $menkey => $menuval)
 	{
 	    if (empty($noout)) print_start_menu_entry($menuval['idsel'],$menuval['classname'],$menuval['enabled']);
-	    if (empty($noout)) print_text_menu_entry($menuval['titre'], $menuval['enabled'], ($menuval['url']!='#'?DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
+	    if (empty($noout)) print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url']!='#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT:'').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target']?$menuval['target']:$atarget));
 	    if (empty($noout)) print_end_menu_entry($menuval['enabled']);
 	}
 
@@ -664,7 +664,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 			}
 
 			// Contacts
-			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ThirdParty") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
+			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
 			$newmenu->add("/contact/card.php?leftmenu=contacts&action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
 			$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
 			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);

htdocs/core/modules/cheque/mod_chequereceipt_mint.php

@@ -73,7 +73,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 		$posindice=9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -107,7 +107,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 		$posindice=9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque";
-		$sql.= " WHERE ref like '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref like '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/commande/mod_commande_marbre.php

@@ -73,7 +73,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -107,7 +107,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."commande";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/contract/doc/pdf_strato.modules.php

@@ -83,6 +83,7 @@ class pdf_strato extends ModelePDFContract
 		// Dimension page pour format A4
 		$this->type = 'pdf';
 		$formatarray=pdf_getFormat();
+
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
 		$this->format = array($this->page_largeur,$this->page_hauteur);
@@ -465,17 +466,20 @@ class pdf_strato extends ModelePDFContract
 
 		if (empty($hidebottom))
 		{
-			$pdf->SetXY(20,230);
+			$posmiddle = $this->marge_gauche + round(($this->page_largeur - $this->marge_gauche - $this->marge_droite)/2);
-			$pdf->MultiCell(66,5, $outputlangs->transnoentities("ContactNameAndSignature", $this->emetteur->name),0,'L',0);
+			$posy = $tab_top + $tab_height + 3 + 3;
 
-			$pdf->SetXY(20,235);
+			$pdf->SetXY($this->marge_gauche, $posy);
-			$pdf->MultiCell(80,25, '', 1);
+			$pdf->MultiCell($posmiddle - $this->marge_gauche - 5, 5, $outputlangs->transnoentities("ContactNameAndSignature", $this->emetteur->name),0,'L',0);
 
-			$pdf->SetXY(110,230);
+			$pdf->SetXY($this->marge_gauche, $posy + 5);
-			$pdf->MultiCell(80,5, $outputlangs->transnoentities("ContactNameAndSignature", $this->recipient->name),0,'L',0);
+			$pdf->MultiCell($posmiddle - $this->marge_gauche - 5, 20, '', 1);
 
-			$pdf->SetXY(110,235);
+			$pdf->SetXY($posmiddle + 5, $posy);
-			$pdf->MultiCell(80,25, '', 1);
+			$pdf->MultiCell($this->page_largeur-$this->marge_droite - $posmiddle - 5, 5, $outputlangs->transnoentities("ContactNameAndSignature", $this->recipient->name),0,'L',0);
+
+			$pdf->SetXY($posmiddle + 5, $posy + 5);
+			$pdf->MultiCell($this->page_largeur-$this->marge_droite - $posmiddle - 5, 20, '', 1);
 		}
 	}
 

htdocs/core/modules/contract/mod_contract_serpis.php

@@ -72,7 +72,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -105,7 +105,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/expedition/mod_expedition_safor.php

@@ -71,7 +71,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expedition";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -104,7 +104,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expedition";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/expensereport/mod_expensereport_jade.php

@@ -72,7 +72,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -105,7 +105,7 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/facture/mod_facture_mars.php

@@ -89,7 +89,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE facnumber LIKE '".$this->db->escape($this->prefixinvoice)."____-%'";
+		$sql.= " WHERE facnumber LIKE '".$db->escape($this->prefixinvoice)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -111,7 +111,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$posindice=8;
 		$sql = "SELECT MAX(SUBSTRING(facnumber FROM ".$posindice.")) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE facnumber LIKE '".$this->db->escape($this->prefixcreditnote)."____-%'";
+		$sql.= " WHERE facnumber LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/facture/mod_facture_terre.php

@@ -87,7 +87,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE facnumber LIKE '".$this->db->escape($this->prefixinvoice)."____-%'";
+		$sql.= " WHERE facnumber LIKE '".$db->escape($this->prefixinvoice)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -109,7 +109,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE facnumber LIKE '".$this->db->escape($this->prefixcreditnote)."____-%'";
+		$sql.= " WHERE facnumber LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -130,7 +130,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(facnumber FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql.= " WHERE facnumber LIKE '".$this->db->escape($this->prefixdeposit)."____-%'";
+		$sql.= " WHERE facnumber LIKE '".$db->escape($this->prefixdeposit)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/fichinter/mod_pacific.php

@@ -74,7 +74,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " WHERE entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -110,7 +110,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."fichinter";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/fichinter/modules_fichinter.php

@@ -60,8 +60,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator
 
 
 /**
- *  \class      ModeleNumRefFicheinter
+ *  Classe mere des modeles de numerotation des references de fiches d'intervention
- *  \brief      Classe mere des modeles de numerotation des references de fiches d'intervention
  */
 abstract class ModeleNumRefFicheinter
 {

htdocs/core/modules/livraison/mod_livraison_jade.php

@@ -80,7 +80,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
         $posindice=8;
         $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
         $sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
         $sql.= " AND entity = ".$conf->entity;
 
         $resql=$db->query($sql);
@@ -114,7 +114,7 @@ class mod_livraison_jade extends ModeleNumRefDeliveryOrder
         $posindice=8;
         $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";   // This is standard SQL
         $sql.= " FROM ".MAIN_DB_PREFIX."livraison";
-        $sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
         $sql.= " AND entity = ".$conf->entity;
 
         $resql=$db->query($sql);

htdocs/core/modules/modProduct.class.php

@@ -162,7 +162,7 @@ class modProduct extends DolibarrModules
 		if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly']='NPR';
 		if (! empty($conf->stock->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.stock'=>'Stock','p.seuil_stock_alerte'=>'StockLimit','p.desiredstock'=>'DesiredStock','p.pmp'=>'PMPValue'));
 		if (! empty($conf->barcode->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.barcode'=>'BarCode'));
-		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'SuppliersPrices'));
+		if (! empty($conf->fournisseur->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('s.nom'=>'Supplier','pf.ref_fourn'=>'SupplierRef','pf.unitprice'=>'BuyingPrice','pf.quantity'=>'QtyMin','pf.remise_percent'=>'DiscountQtyMin'));
 		if (! empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('p.cost_price'=>'CostPrice'));
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('group_concat(cat.label)'=>'Categories'));
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_fields_array[$r]=array_merge($this->export_fields_array[$r],array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel','l.description'=>'TranslatedDescription','l.note'=>'TranslatedNote'));
@@ -170,7 +170,7 @@ class modProduct extends DolibarrModules
 		$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Numeric",'p.width'=>"Numeric",'p.height'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Numeric",'p.price_ttc'=>"Numeric",'p.tva_tx'=>'Numeric','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
 		if (! empty($conf->stock->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.stock'=>'Numeric','p.seuil_stock_alerte'=>'Numeric','p.desiredstock'=>'Numeric','p.pmp'=>'Numeric','p.cost_price'=>'Numeric'));
 		if (! empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('p.barcode'=>'Text'));
-		if (! empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('s.nom'=>'Text','pf.ref_fourn'=>'Text','pf.unitprice'=>'Numeric'));
+		if (! empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('s.nom'=>'Text','pf.ref_fourn'=>'Text','pf.unitprice'=>'Numeric','pf.quantity'=>'Numeric','pf.remise_percent'=>'Numeric'));
 		if (! empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array('l.lang'=>'Text', 'l.label'=>'Text','l.description'=>'Text','l.note'=>'Text'));
 		if (! empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_TypeFields_array[$r]=array_merge($this->export_TypeFields_array[$r],array("group_concat(cat.label)"=>'Text'));
 		$this->export_entities_array[$r]=array();		// We define here only fields that use another icon that the one defined into import_icon

htdocs/core/modules/payment/mod_payment_cicada.php

@@ -73,7 +73,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 		$posindice=9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiement";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -107,7 +107,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 		$posindice=9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiement";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/printing/printgcp.modules.php

@@ -284,7 +284,7 @@ class printing_printgcp extends PrintingDriver
     {
         require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        global $conf, $user, $db;
+        global $conf, $user;
         $error = 0;
 
         $fileprint=$conf->{$module}->dir_output;
@@ -293,7 +293,7 @@ class printing_printgcp extends PrintingDriver
         $mimetype = dol_mimetype($fileprint);
         // select printer uri for module order, propal,...
         $sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$module."' AND driver='printgcp' AND userid=".$user->id;
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $obj = $this->db->fetch_object($result);
@@ -315,7 +315,7 @@ class printing_printgcp extends PrintingDriver
                 }
             }
         }
-        else dol_print_error($db);
+        else dol_print_error($this->db);
 
         $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
         $this->errors = 'PRINTGCP: '.mb_convert_encoding($ret['errormessage'], "UTF-8");

htdocs/core/modules/printing/printipp.modules.php

@@ -77,7 +77,7 @@ class printing_printipp extends PrintingDriver
      */
     function print_file($file, $module, $subdir='')
     {
-        global $conf, $user, $db;
+        global $conf, $user;
         $error = 0;
 
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
@@ -92,7 +92,7 @@ class printing_printipp extends PrintingDriver
 
         // select printer uri for module order, propal,...
         $sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$module."' AND driver = 'printipp' AND userid = ".$user->id;
-        $result = $db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             $obj = $this->db->fetch_object($result);
@@ -116,7 +116,7 @@ class printing_printipp extends PrintingDriver
                 }
             }
         }
-        else dol_print_error($db);
+        else dol_print_error($this->db);
 
         // Set number of copy
         $ipp->setCopies($obj->copy);

htdocs/core/modules/project/mod_project_simple.php

@@ -75,7 +75,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
         $sql.= " FROM ".MAIN_DB_PREFIX."projet";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
         $sql.= " AND entity = ".$conf->entity;
         $resql=$db->query($sql);
         if ($resql)
@@ -111,7 +111,7 @@ class mod_project_simple extends ModeleNumRefProjects
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."projet";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/project/task/mod_task_simple.php

@@ -76,7 +76,7 @@ class mod_task_simple extends ModeleNumRefTask
 		$sql = "SELECT MAX(CAST(SUBSTRING(task.ref FROM " . $posindice . ") AS SIGNED)) as max";
 		$sql .= " FROM " . MAIN_DB_PREFIX . "projet_task AS task, ";
 		$sql .= MAIN_DB_PREFIX . "projet AS project WHERE task.fk_projet=project.rowid";
-		$sql .= " AND task.ref LIKE '" . $this->db->escape($this->prefix) . "____-%'";
+		$sql .= " AND task.ref LIKE '" . $db->escape($this->prefix) . "____-%'";
 		$sql .= " AND project.entity = " . $conf->entity;
         $resql=$db->query($sql);
         if ($resql)
@@ -112,7 +112,7 @@ class mod_task_simple extends ModeleNumRefTask
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."projet_task";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 
 		$resql=$db->query($sql);
 		if ($resql)

htdocs/core/modules/propale/mod_propale_marbre.php

@@ -75,7 +75,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."propal";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -112,7 +112,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."propal";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/societe/mod_codecompta_aquarium.php

@@ -159,7 +159,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$sql.= " WHERE ";
 		if ($type == 'customer') $sql.= "code_compta";
 		else if ($type == 'supplier') $sql.= "code_compta_fournisseur";
-		$sql.= " = '".$this->db->escape($code)."'";
+		$sql.= " = '".$db->escape($code)."'";
 		if (! empty($societe->id)) $sql.= " AND rowid <> ".$societe->id;
 
 		$resql=$db->query($sql);

htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php

@@ -82,7 +82,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefixinvoice)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 		$resql=$db->query($sql);
 		if ($resql)
@@ -103,7 +103,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefixcreditnote)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -124,7 +124,7 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefixdeposit)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php

@@ -85,7 +85,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
         $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
         $sql.= " AND entity = ".$conf->entity;
         $resql=$db->query($sql);
         if ($resql)
@@ -120,7 +120,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
         $posindice=8;
         $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
         $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
         $sql.= " AND entity = ".$conf->entity;
 
         $resql=$db->query($sql);

htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php

@@ -73,7 +73,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 		$posindice=9;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -107,7 +107,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 		$posindice=10;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."paiementfourn";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php

@@ -75,7 +75,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);
@@ -112,7 +112,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		$posindice=8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
 		$sql.= " FROM ".MAIN_DB_PREFIX."supplier_proposal";
-		$sql.= " WHERE ref LIKE '".$this->db->escape($this->prefix)."____-%'";
+		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql.= " AND entity = ".$conf->entity;
 
 		$resql=$db->query($sql);

htdocs/core/tpl/card_presend.tpl.php

@@ -0,0 +1,206 @@
+<?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/
+ */
+
+
+/*
+ * Code to ouput content when action is presend
+ *
+ * $trackid must be defined
+ * $modelmail
+ * $defaulttopic
+ * $diroutput
+ */
+
+if ($action == 'presend')
+{
+	$langs->load("mails");
+
+	$titreform='SendMail';
+
+	$object->fetch_projet();
+
+	$ref = dol_sanitizeFileName($object->ref);
+	include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+	//
+	if ($object->element == 'invoice_supplier')
+	{
+		$fileparams = dol_most_recent_file($diroutput . '/' . get_exdir($object->id,2,0,0,$object,$object->element).$ref, preg_quote($ref,'/').'([^\-])+');
+	}
+
+	$file = $fileparams['fullname'];
+
+	// Define output language
+	$outputlangs = $langs;
+	$newlang = '';
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+	{
+		$newlang = $_REQUEST['lang_id'];
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+	{
+		$newlang = $object->thirdparty->default_lang;
+	}
+
+	if (!empty($newlang))
+	{
+		$outputlangs = new Translate('', $conf);
+		$outputlangs->setDefaultLang($newlang);
+		$outputlangs->load('commercial');
+	}
+
+	$topicmail='';
+	if (empty($object->ref_client)) {
+		$topicmail = $outputlangs->trans($defaulttopic, '__REF__');
+	} else if (! empty($object->ref_client)) {
+		$topicmail = $outputlangs->trans($defaulttopic, '__REF__ (__REFCLIENT__)');
+	}
+
+	// Build document if it not exists
+	if (! $file || ! is_readable($file)) {
+		$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+		if ($result <= 0) {
+			dol_print_error($db, $object->error, $object->errors);
+			exit();
+		}
+		$fileparams = dol_most_recent_file($diroutput . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
+		$file = $fileparams['fullname'];
+	}
+
+	print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
+	print '<div class="clearboth"></div>';
+	print '<br>';
+	print load_fiche_titre($langs->trans($titreform));
+
+	dol_fiche_head('');
+
+	// Cree l'objet formulaire mail
+	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+	$formmail = new FormMail($db);
+	$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
+	$formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
+
+	if ($formmail->fromtype === 'user')
+	{
+		$formmail->fromid = $user->id;
+	}
+	$formmail->trackid=$trackid;
+	if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
+	{
+		include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
+	}
+	$formmail->withfrom = 1;
+
+	$liste = array();
+	if ($object->element == 'expensereport')
+	{
+		$fuser = new User($db);
+		$fuser->fetch($object->fk_user_author);
+		$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
+	}
+	elseif ($object->element == 'societe')
+	{
+		foreach ($object->thirdparty_and_contact_email_array(1) as $key => $value) {
+			$liste[$key] = $value;
+		}
+	}
+	else
+	{
+		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
+			$liste[$key] = $value;
+		}
+	}
+
+	$formmail->withto = GETPOST('sendto') ? GETPOST('sendto') : $liste;
+	$formmail->withtocc = $liste;
+	$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+	$formmail->withtopic = $topicmail;
+	$formmail->withfile = 2;
+	$formmail->withbody = 1;
+	$formmail->withdeliveryreceipt = 1;
+	$formmail->withcancel = 1;
+
+	// Make substitution in email content
+	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$substitutionarray['__PERSONALIZED__'] = '';
+	$substitutionarray['__CONTACTCIVNAME__'] = '';
+	// Add specific substitution for contracts
+	if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
+	{
+		$datenextexpiration = '';
+		foreach ($object->lines as $line)
+		{
+			if ($line->statut != 4)
+				continue;
+				if ($line->date_fin_prevue > $datenextexpiration)
+					$datenextexpiration = $line->date_fin_prevue;
+		}
+		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+		$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+	}
+
+	// Choose one contact for the __CONTACTCIVNAME__ TODO Really not reliable.
+	/*
+	$custcontact = '';
+	$contactarr = array();
+	$contactarr = $object->liste_contact(-1, 'external');
+	if (is_array($contactarr) && count($contactarr) > 0)
+	{
+	foreach ($contactarr as $contact)
+	{
+	if ($contact['libelle'] == $langs->trans('TypeContact_commande_external_CUSTOMER')) {	// TODO Use code and not label
+	$contactstatic = new Contact($db);
+	$contactstatic->fetch($contact ['id']);
+	$custcontact = $contactstatic->getFullName($langs, 1);
+	}
+	}
+
+	if (! empty($custcontact)) {
+	$formmail->substit['__CONTACTCIVNAME__'] = $custcontact;
+	}
+	}*/
+
+	$parameters = array(
+		'mode' => 'formemail'
+	);
+	complete_substitutions_array($substitutionarray, $outputlangs, $object, $parameters);
+
+	// Tableau des substitutions
+	$formmail->substit = $substitutionarray;
+
+	// Tableau des parametres complementaires
+	$formmail->param['action'] = 'send';
+	$formmail->param['models'] = $modelmail;
+	$formmail->param['models_id']=GETPOST('modelmailselected','int');
+	$formmail->param['id'] = $object->id;
+	$formmail->param['returnurl'] = $_SERVER["PHP_SELF"] . '?id=' . $object->id;
+
+	// Init list of files
+	if (GETPOST("mode") == 'init') {
+		$formmail->clear_attached_files();
+		$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
+	}
+
+	// Show form
+	print $formmail->get_form();
+
+	dol_fiche_end();
+}
+

htdocs/core/tpl/massactions_form.tpl.php

@@ -0,0 +1,163 @@
+<?php
+/* Copyright (C)    2013      Cédric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C)    2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C)	2015	  Marcos García		  <marcosgdf@gmail.com>
+ *
+ * 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/
+ */
+
+// Following var must be set:
+// $arrayofselected = array of id selected
+// $object
+// $objecttmp=new Propal($db);
+// $topicmail="SendSupplierProposalRef";
+// $modelmail="supplier_proposal_send";
+// $trackid='ord'.$object->id;
+
+$langs->load("mails");
+
+if (! GETPOST('cancel', 'alpha'))
+{
+	$listofselectedid = array();
+	$listofselectedthirdparties = array();
+	$listofselectedref = array();
+	foreach ($arrayofselected as $toselectid)
+	{
+		$result = $objecttmp->fetch($toselectid);
+		if ($result > 0)
+		{
+			$listofselectedid[$toselectid] = $toselectid;
+			$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
+			if ($objecttmp->element == 'societe')
+				$thirdpartyid = $objecttmp->id;
+			if ($objecttmp->element == 'expensereport')
+				$thirdpartyid = $objecttmp->fk_user_author;
+			$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
+			$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
+		}
+	}
+}
+
+print '<input type="hidden" name="massaction" value="confirm_presend">';
+
+include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+$formmail = new FormMail($db);
+
+dol_fiche_head(null, '', '');
+
+// Cree l'objet formulaire mail
+include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+$formmail = new FormMail($db);
+$formmail->withform = -1;
+$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (! empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
+
+if ($formmail->fromtype === 'user')
+{
+	$formmail->fromid = $user->id;
+}
+$formmail->trackid = $trackid;
+if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2)) // If bit 2 is set
+{
+	include DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+	$formmail->frommail = dolAddEmailTrackId($formmail->frommail, $trackid);
+}
+$formmail->withfrom = 1;
+$liste = $langs->trans("AllRecipientSelected", count($listofselectedthirdparties));
+if (count($listofselectedthirdparties) == 1) // Only 1 different recipient selected, we can suggest contacts
+{
+	$liste = array();
+	$thirdpartyid = array_shift($listofselectedthirdparties);
+	if ($objecttmp->element == 'expensereport')
+	{
+		$fuser = new User($db);
+		$fuser->fetch($thirdpartyid);
+		$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
+	}
+	else
+	{
+		$soc = new Societe($db);
+		$soc->fetch($thirdpartyid);
+		foreach ($soc->thirdparty_and_contact_email_array(1) as $key => $value) {
+			$liste[$key] = $value;
+		}
+	}
+	$formmail->withtoreadonly = 0;
+} else {
+	$formmail->withtoreadonly = 1;
+}
+$formmail->withto = $liste;
+$formmail->withtofree = 0;
+$formmail->withtocc = 1;
+$formmail->withtoccc = $conf->global->MAIN_EMAIL_USECCC;
+$formmail->withtopic = $langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
+$formmail->withfile = 1;
+// $formmail->withfile = 2; Not yet supported in mass action
+$formmail->withmaindocfile = 1; // Add a checkbox "Attach also main document"
+if ($objecttmp->element != 'societe') {
+	$formmail->withfile = $langs->trans("OnlyPDFattachmentSupported");
+	$formmail->withmaindocfile = - 1; // Add a checkbox "Attach also main document" but not checked by default
+}
+$formmail->withbody = 1;
+$formmail->withdeliveryreceipt = 1;
+$formmail->withcancel = 1;
+
+// Make substitution in email content
+$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
+$substitutionarray['__EMAIL__'] = $sendto;
+$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . $object->thirdparty->tag . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+$substitutionarray['__PERSONALIZED__'] = '';
+$substitutionarray['__CONTACTCIVNAME__'] = '';
+// Add specific substitution for contracts
+if (is_object($object) && $object->element == 'contrat' && is_array($object->lines))
+{
+	$datenextexpiration = '';
+	foreach ($object->lines as $line)
+	{
+		if ($line->statut != 4)
+			continue;
+		if ($line->date_fin_prevue > $datenextexpiration)
+			$datenextexpiration = $line->date_fin_prevue;
+	}
+	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATE__'] = dol_print_date($datenextexpiration, 'dayrfc');
+	$substitutionarray['__CONTRACT_NEXT_EXPIRATION_DATETIME__'] = dol_print_date($datenextexpiration, 'standard');
+}
+
+$parameters = array(
+	'mode' => 'formemail'
+);
+complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
+
+// Tableau des substitutions
+$formmail->substit = $substitutionarray;
+
+// Tableau des parametres complementaires du post
+$formmail->param['action'] = $action;
+$formmail->param['models'] = $modelmail;
+$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
+$formmail->param['id'] = join(',', $arrayofselected);
+// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
+if (! empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
+{
+	$langs->load("errors");
+	print img_warning() . ' ' . $langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
+	print ' - <a href="javascript: window.history.go(-1)">' . $langs->trans("GoBack") . '</a>';
+	$arrayofmassactions = array();
+}
+else
+{
+	print $formmail->get_form();
+}
+
+dol_fiche_end();

htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php

@@ -1,10 +1,10 @@
 <?php
-/* Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2009-2011 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2014 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013	   Cedric GROSS         <c.gross@kreiz-it.fr>
- * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2015       Bahfir Abbes        <bafbes@gmail.com>
+ * Copyright (C) 2015      Bahfir Abbes         <bafbes@gmail.com>
  *
  * 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
@@ -111,6 +111,21 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
             $object->sendtoid=0;
 		}
+		elseif ($action == 'CONTRACT_SENTBYMAIL')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("contract");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractSentByEMail",$object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg=$langs->transnoentities("ContractSentByEMail",$object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		}
 		elseif ($action == 'PROPAL_VALIDATE')
         {
             $langs->load("agenda");
@@ -334,7 +349,10 @@ class InterfaceActionsAuto extends DolibarrTriggers
             $langs->load("interventions");
 
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            if (empty($object->actionmsg))
+            {
+            	$object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            }
 
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
@@ -404,6 +422,54 @@ class InterfaceActionsAuto extends DolibarrTriggers
             // Parameters $object->sendtoid defined by caller
             //$object->sendtoid=0;
 		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+			$object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			if (empty($object->actionmsg))
+			{
+				$object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			}
+
+			// Parameters $object->sendtoid defined by caller
+			//$object->sendtoid=0;
+		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+			$object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+
+			$object->sendtoid=0;
+		}
+		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
+		{
+			$langs->load("agenda");
+			$langs->load("other");
+			$langs->load("propal");
+
+			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+			$object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+
+			$object->sendtoid=0;
+		}
 		elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             $langs->load("agenda");

htdocs/don/list.php

@@ -89,7 +89,7 @@ $sql = "SELECT d.rowid, d.datedon, d.firstname, d.lastname, d.societe,";
 $sql.= " d.amount, d.fk_statut as statut, ";
 $sql.= " p.rowid as pid, p.ref, p.title, p.public";
 $sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
-$sql.= " ON p.rowid = d.fk_projet WHERE 1 = 1";
+$sql.= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('don').")";
 if ($statut != '' && $statut != '-1')
 {
 	$sql .= " AND d.fk_statut IN (".$db->escape($statut).")";

htdocs/expensereport/card.php

@@ -125,9 +125,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
+	if ($cancel)
-    {
+	{
-        $action='';
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+
     	$fk_projet='';
     	$date_start='';
     	$date_end='';
@@ -137,7 +143,7 @@ if (empty($reshook))
     	$value_unit='';
     	$qty=1;
     	$fk_c_type_fees=-1;
-    }
+	}
 
     include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; 	// Must be include, not include_once
 
@@ -1260,6 +1266,15 @@ if (empty($reshook))
     	}
     }
 
+	// Actions when printing a doc from card
+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+    // Actions to send emails
+    $trigger_name='EXPENSEREPORT_SENTBYMAIL';
+    $autocopy='MAIN_MAIL_AUTOCOPY_EXPENSEREPORT_TO';
+    $trackid='exp'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
     // Actions to build doc
     $upload_dir = $conf->expensereport->dir_output;
     $permissioncreate = $user->rights->expensereport->creer;
@@ -2085,7 +2100,7 @@ else
 								print '<td style="text-align:center;">';
 								print '<input type="hidden" name="rowid" value="'.$line->rowid.'">';
 								print '<input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
-								print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
+								print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'">';
 								print '</td>';
 						}
 
@@ -2202,6 +2217,14 @@ if ($action != 'create' && $action != 'edit')
 	$object = new ExpenseReport($db);
 	$object->fetch($id, $ref);
 
+	// Send
+	if ($object->fk_statut > ExpenseReport::STATUS_DRAFT) {
+		//if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expensereport->expensereport_advance->send)) {
+			print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendByMail') . '</a></div>';
+		//} else
+		//	print '<div class="inline-block divButAction"><a class="butActionRefused" href="#">' . $langs->trans('SendByMail') . '</a></div>';
+	}
+
 
 	/* Si l'état est "Brouillon"
 	 *	ET user à droit "creer/supprimer"
@@ -2355,48 +2378,65 @@ print '</div>';
 //$conf->global->DOL_URL_ROOT_DOCUMENT_PHP=dol_buildpath('/expensereport/documentwrapper.php',1);
 
 
-print '<div class="fichehalfleft">';
+// Select mail models is same action as presend
-
+if (GETPOST('modelselected')) {
-/*
+	$action = 'presend';
- * Generate documents
- */
-
-if($user->rights->expensereport->export && $action != 'create' && $action != 'edit')
-{
-	$filename	=	dol_sanitizeFileName($object->ref);
-	$filedir	=	$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$urlsource	=	$_SERVER["PHP_SELF"]."?id=".$object->id;
-	$genallowed	=	1;
-	$delallowed	=	1;
-	$var 		= 	true;
-	print $formfile->showdocuments('expensereport',$filename,$filedir,$urlsource,$genallowed,$delallowed);
-	$somethingshown = $formfile->numoffiles;
 }
 
-print '</div>';
+if ($action != 'presend')
-
-if ($action != 'create' && $action != 'edit' && ($id || $ref))
 {
-    $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
+	print '<div class="fichehalfleft">';
-	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
 
-    // Link invoice to intervention
+	/*
-    if (GETPOST('LinkedFichinter')) {
+	 * Generate documents
-        $object->fetch($id);
+	 */
-        $object->fetch_thirdparty();
-        $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
-    }
 
-    // Show links to link elements
+	if($user->rights->expensereport->export && $action != 'create' && $action != 'edit')
-    $linktoelements=array();
+	{
-    if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION))
+		$filename	=	dol_sanitizeFileName($object->ref);
-    {
+		$filedir	=	$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);
-        $linktoelements[]='fichinter';
+		$urlsource	=	$_SERVER["PHP_SELF"]."?id=".$object->id;
-        $linktoelem = $form->showLinkToObjectBlock($object, $linktoelements, array('expensereport'));
+		$genallowed	=	1;
-        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		$delallowed	=	1;
-    }
+		$var 		= 	true;
+		print $formfile->showdocuments('expensereport',$filename,$filedir,$urlsource,$genallowed,$delallowed);
+		$somethingshown = $formfile->numoffiles;
+	}
+
+	print '</div>';
+
+	if ($action != 'create' && $action != 'edit' && ($id || $ref))
+	{
+	    $permissiondellink=$user->rights->facture->creer;	// Used by the include of actions_dellink.inc.php
+		include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';		// Must be include, not include_once
+
+	    // Link invoice to intervention
+	    if (GETPOST('LinkedFichinter')) {
+	        $object->fetch($id);
+	        $object->fetch_thirdparty();
+	        $result = $object->add_object_linked('fichinter', GETPOST('LinkedFichinter'));
+	    }
+
+	    // Show links to link elements
+	    $linktoelements=array();
+	    if (! empty($conf->global->EXPENSES_LINK_TO_INTERVENTION))
+	    {
+	        $linktoelements[]='fichinter';
+	        $linktoelem = $form->showLinkToObjectBlock($object, $linktoelements, array('expensereport'));
+	        $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+	    }
+	}
 }
 
+// Presend form
+$modelmail='expensereport';
+$defaulttopic='SendExpenseReportRef';
+$diroutput = $conf->expensereport->dir_output;
+$trackid = 'exp'.$object->id;
+
+include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+
+
 llxFooter();
 
 $db->close();

htdocs/expensereport/list.php

@@ -36,14 +36,14 @@ $langs->load("companies");
 $langs->load("users");
 $langs->load("trips");
 
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
 $massaction=GETPOST('massaction','alpha');
 $show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
 $toselect = GETPOST('toselect', 'array');
 
 // Security check
-$socid = $_GET["socid"]?$_GET["socid"]:'';
+$socid = GETPOST('socid','int');
 if ($user->societe_id) $socid=$user->societe_id;
 $result = restrictedArea($user, 'expensereport','','');
 
@@ -79,8 +79,8 @@ $optioncss = GETPOST('optioncss','alpha');
 if ($search_status == '') $search_status=-1;
 if ($search_user == '') $search_user=-1;
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+// Initialize technical object to manage context to save list fields
-$contextpage='expensereportlist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'expensereportlist';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('expensereportlist'));
@@ -139,25 +139,31 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 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'))		// Both test must be present to be compatible with all browsers
-{
-    $search_ref="";
-    $search_user="";
-    $search_amount_ht="";
-    $search_amount_vat="";
-    $search_amount_ttc="";
-    $search_status="";
-    $month_start="";
-    $year_start="";
-    $month_end="";
-    $year_end="";
-    $toselect='';
-    $search_array_options=array();
-}
-
 if (empty($reshook))
 {
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha'))		// Both test must be present to be compatible with all browsers
+	{
+	    $search_ref="";
+	    $search_user="";
+	    $search_amount_ht="";
+	    $search_amount_vat="";
+	    $search_amount_ttc="";
+	    $search_status="";
+	    $month_start="";
+	    $year_start="";
+	    $month_end="";
+	    $year_end="";
+	    $toselect='';
+	    $search_array_options=array();
+	}
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
+		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+	{
+		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
     $objectclass='ExpenseReport';
     $objectlabel='ExpenseReport';
     $permtoread = $user->rights->expensereport->lire;
@@ -167,7 +173,6 @@ if (empty($reshook))
 }
 
 
-
 /*
  * View
  */
@@ -176,7 +181,8 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
-llxHeader('', $langs->trans("ListOfTrips"));
+$title = $langs->trans("ListOfTrips");
+llxHeader('', $title);
 
 $max_year = 5;
 $min_year = 5;
@@ -184,7 +190,7 @@ $min_year = 5;
 
 $sql = "SELECT d.rowid, d.ref, d.fk_user_author, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,";
 $sql.= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_valid, d.date_approve, d.note_private, d.note_public,";
-$sql.= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.statut, u.photo";
+$sql.= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.email, u.statut, u.photo";
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ",ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
@@ -267,6 +273,7 @@ $sql.=$hookmanager->resPrint;
 
 $sql.= $db->order($sortfield,$sortorder);
 
+// Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
@@ -276,14 +283,14 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql.= $db->plimit($limit+1, $offset);
 
 //print $sql;
-$resql=$db->query($sql);
+$resql = $db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
 
-	$param="";
+	$param='';
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
 	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
 	if ($sall)					$param.="&sall=".$sall;
@@ -303,25 +310,37 @@ if ($resql)
 
 	// List of mass actions available
 	$arrayofmassactions =  array(
-	    //'presend'=>$langs->trans("SendByMail"),
+	    'presend'=>$langs->trans("SendByMail"),
 	    'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	if ($user->rights->expensereport->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
 	if ($massaction == 'presend') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+	// Lines of title fields
+	print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
     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">';
 	print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 
 	$title = $langs->trans("ListTripsAndExpenses");
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
 
+	if ($massaction == 'presend')
+	{
+		$topicmail="SendExpenseReport";
+		$modelmail="expensereport";
+		$objecttmp=new ExpenseReport($db);
+		$trackid='int'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
+	}
+
 	if ($sall)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
@@ -570,6 +589,7 @@ if ($resql)
     			$usertmp->login=$obj->login;
     			$usertmp->statut=$obj->statut;
     			$usertmp->photo=$obj->photo;
+    			$usertmp->email=$obj->email;
     			print $usertmp->getNomUrl(-1);
     			print '</td>';
     			if (! $i) $totalarray['nbfield']++;

htdocs/fichinter/card.php

@@ -714,16 +714,19 @@ if (empty($reshook))
 		exit;
 	}
 
-	/*
+	// Actions when printing a doc from card
-	 * Send mail
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-	 */
 
 	// Actions to send emails
-	$paramname='id';
+	$trigger_name='FICHINTER_SENTBYMAIL';
-	$mode='emailfromintervention';
+	$autocopy='MAIN_MAIL_AUTOCOPY_FICHINTER_TO';
 	$trackid='int'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
+	// Actions to build doc
+	$upload_dir = $conf->ficheinter->dir_output;
+	$permissioncreate = $user->rights->ficheinter->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'update_extras')
 	{
@@ -752,11 +755,6 @@ if (empty($reshook))
 		if ($error) $action = 'edit_extras';
 	}
 
-	// Actions to build doc
-	$upload_dir = $conf->ficheinter->dir_output;
-	$permissioncreate = $user->rights->ficheinter->creer;
-	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-
 	if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
 	{
 		if ($action == 'addcontact')
@@ -1714,124 +1712,18 @@ else if ($id > 0 || ! empty($ref))
 	}
 
 
-	/*
+	// Select mail models is same action as presend
-	 * Action presend
-	 */
 	if (GETPOST('modelselected')) {
 		$action = 'presend';
 	}
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file=$fileparams['fullname'];
 
-		// Define output language
+	// Presend form
-		$outputlangs = $langs;
+	$modelmail='fichinter_send';
-		$newlang = '';
+	$defaulttopic='SendInterventionRef';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+	$diroutput = $conf->ficheinter->dir_output;
-			$newlang = $_REQUEST['lang_id'];
+	$trackid = 'int'.$object->id;
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
 
-		if (!empty($newlang))
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('interventions');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			$result=fichinter_create($db, $object, GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->ficheinter->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file=$fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendInterventionByMail'));
-
-		dol_fiche_head('');
-
-		// Create form object
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='int'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'int'.$object->id);
-		}
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-		$formmail->withtopic=$outputlangs->trans('SendInterventionRef','__FICHINTERREF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit['__FICHINTERREF__']=$object->ref;
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_fichinter_external_CUSTOMER')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='fichinter_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['fichinter_id']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
 }
 
 

htdocs/fourn/commande/card.php

@@ -134,7 +134,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not include_once
 
@@ -904,11 +912,21 @@ if (empty($reshook))
 	    }
 	}
 
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Actions to send emails
+	$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
+	$autocopy='MAIN_MAIL_AUTOCOPY_SUPPLIER_ORDER_TO';
+	$trackid='sor'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+
 	// Actions to build doc
 	$upload_dir = $conf->fournisseur->commande->dir_output;
 	$permissioncreate = $user->rights->fournisseur->commande->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
+
 	if ($action == 'update_extras')
 	{
 		// Fill array 'array_options' with data from add form
@@ -946,9 +964,6 @@ if (empty($reshook))
 		}
 	}
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-
-
 	/*
 	 * Create an order
 	 */
@@ -1158,18 +1173,6 @@ if (empty($reshook))
 	    }
 	}
 
-	/*
-	 * Send mail
-	 */
-
-	// Actions to send emails
-	$trigger_name='ORDER_SUPPLIER_SENTBYMAIL';
-	$paramname='id';
-	$mode='emailfromsupplierorder';
-	$trackid='sor'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
-
-
 	if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && ! GETPOST('cancel','alpha'))
 	{
 	    $ws_url         = $object->thirdparty->webservices_url;
@@ -2143,343 +2146,6 @@ elseif (! empty($object->id))
 
 	dol_fiche_end();
 
-
-	/*
-	 * Action presend
-	 */
-	if (GETPOST('modelselected')) {
-		$action = 'presend';
-	}
-	if ($action == 'presend')
-	{
-		$ref = dol_sanitizeFileName($object->ref);
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-		$file=$fileparams['fullname'];
-
-		// Define output language
-		$outputlangs = $langs;
-		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
-			$newlang = $_REQUEST['lang_id'];
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-			$newlang = $object->thirdparty->default_lang;
-
-		if (!empty($newlang))
-		{
-			$outputlangs = new Translate('', $conf);
-			$outputlangs->setDefaultLang($newlang);
-			$outputlangs->load('commercial');
-		}
-
-		// Build document if it not exists
-		if (! $file || ! is_readable($file))
-		{
-			$result= $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result <= 0)
-			{
-				dol_print_error($db,$result);
-				exit;
-			}
-			$fileparams = dol_most_recent_file($conf->fournisseur->commande->dir_output . '/' . $ref, preg_quote($ref, '/').'[^\-]+');
-			$file=$fileparams['fullname'];
-		}
-
-		print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-		print '<div class="clearboth"></div>';
-		print '<br>';
-		print load_fiche_titre($langs->trans('SendOrderByMail'));
-
-		dol_fiche_head('');
-
-		// Cree l'objet formulaire mail
-		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-		$formmail = new FormMail($db);
-		$formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-        $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-        if($formmail->fromtype === 'user'){
-            $formmail->fromid = $user->id;
-
-        }
-		$formmail->trackid='sor'.$object->id;
-		if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-		{
-			include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-			$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sor'.$object->id);
-		}
-		$formmail->withfrom=1;
-		$liste=array();
-		foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-		$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-		$formmail->withtocc=$liste;
-		$formmail->withtoccc=(! empty($conf->global->MAIN_EMAIL_USECCC)?$conf->global->MAIN_EMAIL_USECCC:false);
-		$formmail->withtopic=$outputlangs->trans('SendOrderRef','__REF__');
-		$formmail->withfile=2;
-		$formmail->withbody=1;
-		$formmail->withdeliveryreceipt=1;
-		$formmail->withcancel=1;
-
-		$object->fetch_projet();
-		// Tableau des substitutions
-		$formmail->setSubstitFromObject($object);
-		$formmail->substit['__ORDERREF__']=$object->ref;                  	// For backward compatibility
-		$formmail->substit['__ORDERSUPPLIERREF__']=$object->ref_supplier;	// For backward compatibility
-		$formmail->substit['__SUPPLIERORDERREF__']=$object->ref_supplier;
-
-		//Find the good contact adress
-		$custcontact='';
-		$contactarr=array();
-		$contactarr=$object->liste_contact(-1,'external');
-
-		if (is_array($contactarr) && count($contactarr)>0) {
-			foreach($contactarr as $contact) {
-				if ($contact['libelle']==$langs->trans('TypeContact_order_supplier_external_BILLING')) {
-					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-					$contactstatic=new Contact($db);
-					$contactstatic->fetch($contact['id']);
-					$custcontact=$contactstatic->getFullName($langs,1);
-				}
-			}
-
-			if (!empty($custcontact)) {
-				$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-			}
-		}
-
-		// Tableau des parametres complementaires
-		$formmail->param['action']='send';
-		$formmail->param['models']='order_supplier_send';
-		$formmail->param['models_id']=GETPOST('modelmailselected','int');
-		$formmail->param['orderid']=$object->id;
-		$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-		// Init list of files
-		if (GETPOST("mode")=='init')
-		{
-			$formmail->clear_attached_files();
-			$formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-		}
-
-		// Show form
-		print $formmail->get_form();
-
-		dol_fiche_end();
-	}
-	/*
-	 * Action webservice
-	 */
-	elseif ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel','alpha'))
-	{
-		$mode        = GETPOST('mode', 'alpha');
-		$ws_url      = $object->thirdparty->webservices_url;
-		$ws_key      = $object->thirdparty->webservices_key;
-		$ws_user     = GETPOST('ws_user','alpha');
-		$ws_password = GETPOST('ws_password','alpha');
-
-        // NS and Authentication parameters
-        $ws_ns = 'http://www.dolibarr.org/ns/';
-        $ws_authentication = array(
-            'dolibarrkey'=>$ws_key,
-            'sourceapplication'=>'DolibarrWebServiceClient',
-            'login'=>$ws_user,
-            'password'=>$ws_password,
-            'entity'=>''
-        );
-
-        print load_fiche_titre($langs->trans('CreateRemoteOrder'),'');
-
-        //Is everything filled?
-        if (empty($ws_url) || empty($ws_key)) {
-            setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors');
-            $mode = "init";
-            $error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled
-        } else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) {
-            setEventMessages($langs->trans("ErrorFieldsRequired"), null, 'errors');
-            $mode = "init";
-        }
-
-        if ($mode == "init")
-        {
-            //Table/form header
-            print '<table class="border" width="100%">';
-            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="webservice">';
-            print '<input type="hidden" name="mode" value="check">';
-
-            if ($error_occurred)
-            {
-                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-            }
-            else
-            {
-                $textinput_size = "50";
-                // Webservice url
-                print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
-                //Remote User
-                print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
-                //Remote Password
-                print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
-                //Submit button
-                print '<tr><td align="center" colspan="2">';
-                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
-                print ' &nbsp; &nbsp; ';
-                //Cancel button
-                print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-                print '</td></tr>';
-            }
-
-            //End table/form
-            print '</form>';
-            print '</table>';
-        }
-        elseif ($mode == "check")
-        {
-            $ws_entity = '';
-            $ws_thirdparty = '';
-            $error_occurred = false;
-
-            //Create SOAP client and connect it to user
-            $soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php");
-            $soapclient_user->soap_defencoding='UTF-8';
-            $soapclient_user->decodeUTF8(false);
-
-            //Get the thirdparty associated to user
-            $ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
-            $result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
-            $user_status_code = $result_user["result"]["result_code"];
-
-            if ($user_status_code == "OK")
-            {
-                //Fill the variables
-                $ws_entity = $result_user["user"]["entity"];
-                $ws_authentication['entity'] = $ws_entity;
-                $ws_thirdparty = $result_user["user"]["fk_thirdparty"];
-                if (empty($ws_thirdparty))
-                {
-                    setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
-                    $error_occurred = true;
-                }
-                else
-                {
-                    //Create SOAP client and connect it to product/service
-                    $soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
-                    $soapclient_product->soap_defencoding='UTF-8';
-                    $soapclient_product->decodeUTF8(false);
-
-                    // Iterate each line and get the reference that uses the supplier of that product/service
-                    $i = 0;
-                    foreach ($object->lines as $line) {
-                        $i = $i + 1;
-                        $ref_supplier = $line->ref_supplier;
-                        $line_id = $i."º) ".$line->product_ref.": ";
-                        if (empty($ref_supplier)) {
-                            continue;
-                        }
-                        $ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
-                        $result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
-                        if (!$result_product)
-                        {
-                            setEventMessages($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors');
-                            $error_occurred = true;
-                            break;
-                        }
-
-                        // Check the result code
-                        $status_code = $result_product["result"]["result_code"];
-                        if (empty($status_code)) //No result, check error str
-                        {
-                            setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-                        }
-                        else if ($status_code != "OK") //Something went wrong
-                        {
-                            if ($status_code == "NOT_FOUND")
-                            {
-                                setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
-                            }
-                            else
-                            {
-                                setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
-                                $error_occurred = true;
-                                break;
-                            }
-                        }
-
-
-                        // Ensure that price is equal and warn user if it's not
-                        $supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
-                        $local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
-
-                        $product_fourn = new ProductFournisseur($db);
-                        $product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
-                        if (count($product_fourn_list)>0)
-                        {
-                            foreach($product_fourn_list as $product_fourn_line)
-                            {
-                                //Only accept the line where the supplier is the same at this order and has the same ref
-                                if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
-                                    $local_price = price($product_fourn_line->fourn_price);
-                                }
-                            }
-                        }
-
-                        if ($local_price != NULL && $local_price != $supplier_price) {
-                            setEventMessages($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, null, 'warnings');
-                        }
-
-                        // Check if is in sale
-                        if (empty($result_product["product"]["status_tosell"])) {
-                            setEventMessages($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", null, 'warnings');
-                        }
-                    }
-                }
-
-            }
-            elseif ($user_status_code == "PERMISSION_DENIED")
-            {
-                setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
-                $error_occurred = true;
-            }
-            elseif ($user_status_code == "BAD_CREDENTIALS")
-            {
-                setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
-                $error_occurred = true;
-            }
-            else
-            {
-                setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
-                $error_occurred = true;
-            }
-
-            //Form
-            print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-            print '<input type="hidden" name="action" value="webservice">';
-            print '<input type="hidden" name="mode" value="send">';
-            print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
-            print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
-            print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
-            print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
-            if ($error_occurred)
-            {
-                print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
-            }
-            else
-            {
-                print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
-                print ' &nbsp; &nbsp; ';
-            }
-            print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-            print '</form>';
-        }
-	}
-	/*
-	 * Show buttons
-	 */
-	else
-	{
 		/**
 		 * Boutons actions
 		 */
@@ -2700,7 +2366,7 @@ elseif (! empty($object->id))
 			}
 
 			print "</div>";
-		}
+
 
 
 		if ($user->rights->fournisseur->commande->commander && $object->statut == 2 && $action == 'makeorder')
@@ -2756,51 +2422,271 @@ elseif (! empty($object->id))
     		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
     		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
-		if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
-		{
-			// Set status to received (action=livraison)
-			print '<!-- form to record supplier order received -->'."\n";
-			print '<form action="card.php?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden"	name="action" value="livraison">';
-			print load_fiche_titre($langs->trans("Receive"),'','');
 
-			print '<table class="noborder" width="100%">';
+			if ($user->rights->fournisseur->commande->receptionner	&& ($object->statut == 3 || $object->statut == 4))
-			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
+			{
-			print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
+				// Set status to received (action=livraison)
-			print $form->select_date('','',1,1,'',"commande",1,1,1);
+				print '<!-- form to record supplier order received -->'."\n";
-			print "</td></tr>\n";
+				print '<form action="card.php?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden"	name="action" value="livraison">';
+				print load_fiche_titre($langs->trans("Receive"),'','');
 
-			print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
+				print '<table class="noborder" width="100%">';
-			$liv = array();
+				//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Receive").'</td></tr>';
-			$liv[''] = '&nbsp;';
+				print '<tr><td>'.$langs->trans("DeliveryDate").'</td><td>';
-			$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
+				print $form->select_date('','',1,1,'',"commande",1,1,1);
-			$liv['par']	= $langs->trans("PartialWoman");
+				print "</td></tr>\n";
-			$liv['nev']	= $langs->trans("NeverReceived");
-			$liv['can']	= $langs->trans("Canceled");
 
-			print $form->selectarray("type",$liv);
+				print "<tr><td>".$langs->trans("Delivery")."</td><td>\n";
+				$liv = array();
+				$liv[''] = '&nbsp;';
+				$liv['tot']	= $langs->trans("CompleteOrNoMoreReceptionExpected");
+				$liv['par']	= $langs->trans("PartialWoman");
+				$liv['nev']	= $langs->trans("NeverReceived");
+				$liv['can']	= $langs->trans("Canceled");
 
-			print '</td></tr>';
+				print $form->selectarray("type",$liv);
-			print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
+
-			print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
+				print '</td></tr>';
-			print "</table>\n";
+				print '<tr><td>'.$langs->trans("Comment").'</td><td><input size="40" type="text" name="comment"></td></tr>';
-			print "</form>\n";
+				print '<tr><td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Receive").'"></td></tr>';
-			print "<br>";
+				print "</table>\n";
+				print "</form>\n";
+				print "<br>";
+			}
+
+	        // List of actions on element
+	        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	        $formactions=new FormActions($db);
+	        $somethingshown = $formactions->showactions($object,'order_supplier',$socid,1,'listaction'.($genallowed?'largetitle':''));
+
+			print '</div></div></div>';
 		}
 
-        // List of actions on element
+		/*
-        include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		 * Action webservice
-        $formactions=new FormActions($db);
+		 */
-        $somethingshown = $formactions->showactions($object,'order_supplier',$socid,1,'listaction'.($genallowed?'largetitle':''));
+		if ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && ! GETPOST('cancel','alpha'))
+		{
+			$mode        = GETPOST('mode', 'alpha');
+			$ws_url      = $object->thirdparty->webservices_url;
+			$ws_key      = $object->thirdparty->webservices_key;
+			$ws_user     = GETPOST('ws_user','alpha');
+			$ws_password = GETPOST('ws_password','alpha');
+
+			// NS and Authentication parameters
+			$ws_ns = 'http://www.dolibarr.org/ns/';
+			$ws_authentication = array(
+			'dolibarrkey'=>$ws_key,
+			'sourceapplication'=>'DolibarrWebServiceClient',
+			'login'=>$ws_user,
+			'password'=>$ws_password,
+			'entity'=>''
+			);
+
+			print load_fiche_titre($langs->trans('CreateRemoteOrder'),'');
+
+			//Is everything filled?
+			if (empty($ws_url) || empty($ws_key)) {
+				setEventMessages($langs->trans("ErrorWebServicesFieldsRequired"), null, 'errors');
+				$mode = "init";
+				$error_occurred = true; //Don't allow to set the user/pass if thirdparty fields are not filled
+			} else if ($mode != "init" && (empty($ws_user) || empty($ws_password))) {
+				setEventMessages($langs->trans("ErrorFieldsRequired"), null, 'errors');
+				$mode = "init";
+			}
+
+			if ($mode == "init")
+			{
+				//Table/form header
+				print '<table class="border" width="100%">';
+				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="webservice">';
+				print '<input type="hidden" name="mode" value="check">';
+
+				if ($error_occurred)
+				{
+					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
+					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				}
+				else
+				{
+					$textinput_size = "50";
+					// Webservice url
+					print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td colspan="3">'.dol_print_url($ws_url).'</td></tr>';
+					//Remote User
+					print '<tr><td>'.$langs->trans("User").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_user"></td></tr>';
+					//Remote Password
+					print '<tr><td>'.$langs->trans("Password").'</td><td><input size="'.$textinput_size.'" type="text" name="ws_password"></td></tr>';
+					//Submit button
+					print '<tr><td align="center" colspan="2">';
+					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("CreateRemoteOrder").'">';
+					print ' &nbsp; &nbsp; ';
+					//Cancel button
+					print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+					print '</td></tr>';
+				}
+
+				//End table/form
+				print '</form>';
+				print '</table>';
+			}
+			elseif ($mode == "check")
+			{
+				$ws_entity = '';
+				$ws_thirdparty = '';
+				$error_occurred = false;
+
+				//Create SOAP client and connect it to user
+				$soapclient_user = new nusoap_client($ws_url."/webservices/server_user.php");
+				$soapclient_user->soap_defencoding='UTF-8';
+				$soapclient_user->decodeUTF8(false);
+
+				//Get the thirdparty associated to user
+				$ws_parameters = array('authentication'=>$ws_authentication, 'id' => '', 'ref'=>$ws_user);
+				$result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
+				$user_status_code = $result_user["result"]["result_code"];
+
+				if ($user_status_code == "OK")
+				{
+					//Fill the variables
+					$ws_entity = $result_user["user"]["entity"];
+					$ws_authentication['entity'] = $ws_entity;
+					$ws_thirdparty = $result_user["user"]["fk_thirdparty"];
+					if (empty($ws_thirdparty))
+					{
+						setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
+						$error_occurred = true;
+					}
+					else
+					{
+						//Create SOAP client and connect it to product/service
+						$soapclient_product = new nusoap_client($ws_url."/webservices/server_productorservice.php");
+						$soapclient_product->soap_defencoding='UTF-8';
+						$soapclient_product->decodeUTF8(false);
+
+						// Iterate each line and get the reference that uses the supplier of that product/service
+						$i = 0;
+						foreach ($object->lines as $line) {
+							$i = $i + 1;
+							$ref_supplier = $line->ref_supplier;
+							$line_id = $i."º) ".$line->product_ref.": ";
+							if (empty($ref_supplier)) {
+								continue;
+							}
+							$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
+							$result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
+							if (!$result_product)
+							{
+								setEventMessages($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors');
+								$error_occurred = true;
+								break;
+							}
+
+							// Check the result code
+							$status_code = $result_product["result"]["result_code"];
+							if (empty($status_code)) //No result, check error str
+							{
+								setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
+							}
+							else if ($status_code != "OK") //Something went wrong
+							{
+								if ($status_code == "NOT_FOUND")
+								{
+									setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
+								}
+								else
+								{
+									setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
+									$error_occurred = true;
+									break;
+								}
+							}
 
 
+							// Ensure that price is equal and warn user if it's not
+							$supplier_price = price($result_product["product"]["price_net"]); //Price of client tab in supplier dolibarr
+							$local_price = NULL; //Price of supplier as stated in product suppliers tab on this dolibarr, NULL if not found
 
+							$product_fourn = new ProductFournisseur($db);
+							$product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
+							if (count($product_fourn_list)>0)
+							{
+								foreach($product_fourn_list as $product_fourn_line)
+								{
+									//Only accept the line where the supplier is the same at this order and has the same ref
+									if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
+										$local_price = price($product_fourn_line->fourn_price);
+									}
+								}
+							}
 
-		print '</div></div></div>';}
+							if ($local_price != NULL && $local_price != $supplier_price) {
+								setEventMessages($line_id.$langs->trans("RemotePriceMismatch")." ".$supplier_price." - ".$local_price, null, 'warnings');
+							}
+
+							// Check if is in sale
+							if (empty($result_product["product"]["status_tosell"])) {
+								setEventMessages($line_id.$langs->trans("ProductStatusNotOnSellShort")." '".$ref_supplier."'", null, 'warnings');
+							}
+						}
+					}
+
+				}
+				elseif ($user_status_code == "PERMISSION_DENIED")
+				{
+					setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
+					$error_occurred = true;
+				}
+				elseif ($user_status_code == "BAD_CREDENTIALS")
+				{
+					setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
+					$error_occurred = true;
+				}
+				else
+				{
+					setEventMessages($langs->trans("ResponseNonOK")." '".$user_status_code."'", null, 'errors');
+					$error_occurred = true;
+				}
+
+				//Form
+				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+				print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+				print '<input type="hidden" name="action" value="webservice">';
+				print '<input type="hidden" name="mode" value="send">';
+				print '<input type="hidden" name="ws_user" value="'.$ws_user.'">';
+				print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
+				print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
+				print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
+				if ($error_occurred)
+				{
+					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
+				}
+				else
+				{
+					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
+					print ' &nbsp; &nbsp; ';
+				}
+				print '<input class="button" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '</form>';
+			}
+		}
+
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		// Presend form
+		$modelmail='supplier_order_send';
+		$defaulttopic='SendOrderRef';
+		$diroutput = $conf->fournisseur->commande->dir_output;
+		$trackid = 'sor'.$object->id;
+
+		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 	}
-
-	print '</td></tr></table>';
 }
 
 // End of page

htdocs/fourn/commande/list.php

@@ -48,7 +48,7 @@ $langs->load('compta');
 $langs->load('bills');
 $langs->load('projects');
 
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
 $massaction=GETPOST('massaction','alpha');
 $show_files=GETPOST('show_files','int');
 $confirm=GETPOST('confirm','alpha');
@@ -86,10 +86,6 @@ $optioncss = GETPOST('optioncss','alpha');
 $billed = GETPOST('billed','int');
 $search_project_ref=GETPOST('search_project_ref','alpha');
 
-$page  = GETPOST('page','int');
-$sortorder = GETPOST('sortorder','alpha');
-$sortfield = GETPOST('sortfield','alpha');
-
 $status=GETPOST('statut','alpha');
 $billed=GETPOST('billed','int');
 $viewstatut=GETPOST('viewstatut');
@@ -114,11 +110,11 @@ if (! $sortorder) $sortorder='DESC';
 
 if ($search_status == '') $search_status=-1;
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+// Initialize technical object to manage context to save list fields
-$contextpage='supplierorderlist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'supplierorderlist';
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('orderlist'));
+$hookmanager->initHooks(array($contextpage));
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
@@ -173,7 +169,7 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab
  */
 
 if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha')) { $massaction=''; }
+if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
 $parameters=array('socid'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
@@ -207,6 +203,7 @@ if (empty($reshook))
         $search_total_ht='';
         $search_total_vat='';
         $search_total_ttc='';
+    	$search_project_ref='';
         $search_status=-1;
         $orderyear='';
         $ordermonth='';
@@ -216,16 +213,12 @@ if (empty($reshook))
         $deliveryyear='';
         $billed='';
         $toselect='';
-    	$search_project_ref='';
         $search_array_options=array();
-
+    }
-        // Mass actions
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-        $objectclass='Commande';
+    	|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
-        $objectlabel='Orders';
+    {
-        $permtoread = $user->rights->commande->lire;
+    	$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
-        $permtodelete = $user->rights->commande->supprimer;
-        $uploaddir = $conf->commande->dir_output;
-    	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
     }
 
     // Mass actions
@@ -581,7 +574,6 @@ if ($search_total_ht != '') $sql.= natural_search('cf.total_ht', $search_total_h
 if ($search_total_vat != '') $sql.= natural_search('cf.tva', $search_total_vat, 1);
 if ($search_total_ttc != '') $sql.= natural_search('cf.total_ttc', $search_total_ttc, 1);
 if ($search_project_ref != '') $sql.= natural_search("p.ref",$search_project_ref);
-
 // Add where from extra fields
 foreach ($search_array_options as $key => $val)
 {
@@ -650,6 +642,7 @@ if ($resql)
 	if ($search_total_ttc != '') $param.="&search_total_ttc=".$search_total_ttc;
 	if ($search_refsupp) 		$param.="&search_refsupp=".$search_refsupp;
 	if ($search_status >= 0)  	$param.="&search_status=".$search_status;
+	if ($search_project_ref >= 0)  	$param.="&search_project_ref=".$search_project_ref;
 	if ($billed != '')          $param.="&billed=".$billed;
     if ($show_files)            $param.='&show_files=' .$show_files;
     if ($optioncss != '')       $param.='&optioncss='.$optioncss;
@@ -663,7 +656,7 @@ if ($resql)
 
 	// List of mass actions available
 	$arrayofmassactions =  array(
-	    //'presend'=>$langs->trans("SendByMail"),
+	    'presend'=>$langs->trans("SendByMail"),
 	    'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
@@ -678,108 +671,24 @@ if ($resql)
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="viewstatut" value="'.$viewstatut.'">';
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_commercial.png', 0, '', '', $limit);
 
-	// TODO Move this into an invluce
 	if ($massaction == 'presend')
 	{
-	    $langs->load("mails");
+		$topicmail="SendOrderRef";
+		$modelmail="order_supplier_send";
+		$objecttmp=new CommandeFournisseur($db);
+		$trackid='sord'.$object->id;
 
-	    if (! GETPOST('cancel','alpha'))
+		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	    {
-	        $objecttmp=new CommandeFournisseur($db);
-	        $listofselectedid=array();
-	        $listofselectedthirdparties=array();
-	        $listofselectedref=array();
-	        foreach($arrayofselected as $toselectid)
-	        {
-	            $result=$objecttmp->fetch($toselectid);
-	            if ($result > 0)
-	            {
-	                $listofselectedid[$toselectid]=$toselectid;
-	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
-	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
-	            }
-	        }
-	    }
-
-	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-	    dol_fiche_head(null, '', '');
-
-	    $topicmail="SendOrderRef";
-	    $modelmail="order_send";
-
-	    // Cree l'objet formulaire mail
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-	    $formmail->withform=-1;
-	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-	    if($formmail->fromtype === 'user'){
-	        $formmail->fromid = $user->id;
-
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
-	    {
-	        $formmail->trackid='ord'.$object->id;
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-	    {
-	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'ord'.$object->id);
-	    }
-	    $formmail->withfrom=1;
-	    $liste=$langs->trans("AllRecipientSelected");
-	    if (count($listofselectedthirdparties) == 1)
-	    {
-	        $liste=array();
-	        $thirdpartyid=array_shift($listofselectedthirdparties);
-	        $soc=new Societe($db);
-	        $soc->fetch($thirdpartyid);
-	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-	        {
-	            $liste[$key]=$value;
-	        }
-	        $formmail->withtoreadonly=0;
-	    }
-	    else
-	    {
-	        $formmail->withtoreadonly=1;
-	    }
-	    $formmail->withto=$liste;
-	    $formmail->withtofree=0;
-	    $formmail->withtocc=1;
-	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-	    $formmail->withbody=1;
-	    $formmail->withdeliveryreceipt=1;
-	    $formmail->withcancel=1;
-	    // Tableau des substitutions
-	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
-	    $formmail->substit['__SIGNATURE__']=$user->signature;
-	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
-	    $formmail->substit['__PERSONALIZED__']='';
-	    $formmail->substit['__CONTACTCIVNAME__']='';
-
-	    // Tableau des parametres complementaires du post
-	    $formmail->param['action']=$action;
-	    $formmail->param['models']=$modelmail;
-	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
-	    $formmail->param['id']=join(',',$arrayofselected);
-	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-	    print $formmail->get_form();
-
-	    dol_fiche_end();
 	}
-	elseif ($massaction == 'createbills')
+
+	if ($massaction == 'createbills')
 	{
 	    //var_dump($_REQUEST);
 	    print '<input type="hidden" name="massaction" value="confirm_createbills">';

htdocs/fourn/facture/card.php

@@ -114,7 +114,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-	if ($cancel) $action='';
+	if ($cancel)
+	{
+		if (! empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action='';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not include_once
 
@@ -1211,14 +1219,13 @@ if (empty($reshook))
 	    }
 	}
 
-	/*
+	// Actions when printing a doc from card
-	 * Send mail
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
-	 */
 
 	// Actions to send emails
 	$trigger_name='BILL_SUPPLIER_SENTBYMAIL';
 	$paramname='id';
-	$mode='emailfromsupplierinvoice';
+	$autocopy='MAIN_MAIL_AUTOCOPY_SUPPLIER_INVOICE_TO';
 	$trackid='sin'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
@@ -2823,124 +2830,18 @@ else
 			}
         }
 
-        /*
+        // Select mail models is same action as presend
-         * Show mail form
-         */
         if (GETPOST('modelselected')) {
         	$action = 'presend';
         }
-        if ($action == 'presend')
-        {
-            $ref = dol_sanitizeFileName($object->ref);
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref, preg_quote($ref,'/').'([^\-])+');
-            $file=$fileparams['fullname'];
 
-            // Define output language
+        // Presend form
-            $outputlangs = $langs;
+        $modelmail='supplier_order_send';
-            $newlang = '';
+        $defaulttopic='SendBillRef';
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id']))
+        $diroutput = $conf->fournisseur->facture->dir_output;
-            	$newlang = $_REQUEST['lang_id'];
+        $trackid = 'sin'.$object->id;
-            if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-            	$newlang = $object->thirdparty->default_lang;
 
-            if (!empty($newlang))
+        include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-            {
-                $outputlangs = new Translate('', $conf);
-                $outputlangs->setDefaultLang($newlang);
-                $outputlangs->load('bills');
-            }
-
-            // Build document if it not exists
-            if (! $file || ! is_readable($file))
-            {
-	            $result = $object->generateDocument(GETPOST('model')?GETPOST('model'):$object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                if ($result < 0)
-                {
-                    dol_print_error($db,$object->error,$object->errors);
-                    exit;
-                }
-                $fileparams = dol_most_recent_file($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').$ref, preg_quote($ref,'/').'([^\-])+');
-                $file=$fileparams['fullname'];
-            }
-
-			print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
-            print '<div class="clearboth"></div>';
-            print '<br>';
-            print load_fiche_titre($langs->trans('SendBillByMail'));
-
-            dol_fiche_head('');
-
-            // Cree l'objet formulaire mail
-            include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-            $formmail = new FormMail($db);
-            $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang);
-            $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-            if($formmail->fromtype === 'user'){
-                $formmail->fromid = $user->id;
-
-            }
-           	$formmail->trackid='sin'.$object->id;
-            if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-            {
-            	include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            	$formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sin'.$object->id);
-            }
-            $formmail->withfrom=1;
-			$liste=array();
-			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key=>$value)	$liste[$key]=$value;
-			$formmail->withto=GETPOST("sendto")?GETPOST("sendto"):$liste;
-			$formmail->withtocc=$liste;
-            $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-            $formmail->withtopic=$outputlangs->trans('SendBillRef','__REF__');
-            $formmail->withfile=2;
-            $formmail->withbody=1;
-            $formmail->withdeliveryreceipt=1;
-            $formmail->withcancel=1;
-			// Tableau des substitutions
-			$formmail->setSubstitFromObject($object);
-            $formmail->substit['__SUPPLIERINVREF__']=$object->ref;
-
-            //Find the good contact adress
-            $custcontact='';
-            $contactarr=array();
-            $contactarr=$object->liste_contact(-1,'external');
-
-            if (is_array($contactarr) && count($contactarr)>0) {
-            	foreach($contactarr as $contact) {
-            		if ($contact['libelle']==$langs->trans('TypeContact_invoice_supplier_external_BILLING')) {
-            			require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
-            			$contactstatic=new Contact($db);
-            			$contactstatic->fetch($contact['id']);
-            			$custcontact=$contactstatic->getFullName($langs,1);
-            		}
-            	}
-
-            	if (!empty($custcontact)) {
-            		$formmail->substit['__CONTACTCIVNAME__']=$custcontact;
-            	}
-            }
-
-            // Tableau des parametres complementaires
-            $formmail->param['action']='send';
-            $formmail->param['models']='invoice_supplier_send';
-            $formmail->param['models_id']=GETPOST('modelmailselected','int');
-            $formmail->param['facid']=$object->id;
-            $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-            // Init list of files
-            if (GETPOST("mode")=='init')
-            {
-                $formmail->clear_attached_files();
-                $formmail->add_attached_files($file,basename($file),dol_mimetype($file));
-            }
-
-            // Show form
-            print $formmail->get_form();
-
-            dol_fiche_end();
-        }
     }
 }
 

htdocs/fourn/facture/list.php

@@ -93,9 +93,12 @@ $day_lim	= GETPOST('day_lim','int');
 $month_lim	= GETPOST('month_lim','int');
 $year_lim	= GETPOST('year_lim','int');
 $toselect = GETPOST('toselect', 'array');
+$filter = GETPOST('filtre','alpha');
 
 $option = GETPOST('option');
-if ($option == 'late') $filter = 'paye:0';
+if ($option == 'late') {
+	$filter = 'paye:0';
+}
 
 $search_all = GETPOST('sall', 'alphanohtml');
 $search_label = GETPOST("search_label","alpha");
@@ -116,8 +119,8 @@ $pagenext = $page + 1;
 if (! $sortorder) $sortorder="DESC";
 if (! $sortfield) $sortfield="f.datef,f.rowid";
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+// Initialize technical object to manage context to save list fields
-$contextpage='supplierinvoicelist';
+$contextpage=GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'supplierinvoicelist';
 
 $diroutputmassaction=$conf->fournisseur->facture->dir_output . '/temp/massgeneration/'.$user->id;
 
@@ -472,7 +475,7 @@ if ($resql)
 	);
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['delete']=$langs->trans("Delete");
-	//if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
+	if ($massaction == 'presend' || $massaction == 'createbills') $arrayofmassactions=array();
 	$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 	$i = 0;
@@ -491,102 +494,15 @@ if ($resql)
 
 	if ($massaction == 'presend')
 	{
-	    $langs->load("mails");
+		$topicmail="SendBillRef";
+		$modelmail="supplier_invoice_send";
+		$objecttmp=new FactureFournisseur($db);
+		$trackid='sinv'.$object->id;
 
-	    if (! GETPOST('cancel','alpha'))
+		include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_form.tpl.php';
-	    {
-	    	$objecttmp=new FactureFournisseur($db);
-	        $listofselectedid=array();
-	        $listofselectedthirdparties=array();
-	        $listofselectedref=array();
-	        foreach($arrayofselected as $toselectid)
-	        {
-	            $result=$objecttmp->fetch($toselectid);
-	            if ($result > 0)
-	            {
-	                $listofselectedid[$toselectid]=$toselectid;
-	                $thirdpartyid=$objecttmp->fk_soc?$objecttmp->fk_soc:$objecttmp->socid;
-	                $listofselectedthirdparties[$thirdpartyid]=$thirdpartyid;
-	                $listofselectedref[$thirdpartyid][$toselectid]=$objecttmp->ref;
-	            }
-	        }
-	    }
-
-	    print '<input type="hidden" name="massaction" value="confirm_presend">';
-
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-
-	    dol_fiche_head(null, '', '');
-
-	    $topicmail="SendBillRef";
-	    $modelmail="supplier_invoice_send";
-
-	    // Cree l'objet formulaire mail
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-	    $formmail = new FormMail($db);
-	    $formmail->withform=-1;
-	    $formmail->fromtype = (GETPOST('fromtype')?GETPOST('fromtype'):(!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE)?$conf->global->MAIN_MAIL_DEFAULT_FROMTYPE:'user'));
-
-	    if($formmail->fromtype === 'user'){
-	        $formmail->fromid = $user->id;
-
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 1))	// If bit 1 is set
-	    {
-	        $formmail->trackid='sinv'.$object->id;
-	    }
-	    if (! empty($conf->global->MAIN_EMAIL_ADD_TRACK_ID) && ($conf->global->MAIN_EMAIL_ADD_TRACK_ID & 2))	// If bit 2 is set
-	    {
-	        include DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-	        $formmail->frommail=dolAddEmailTrackId($formmail->frommail, 'sinv'.$object->id);
-	    }
-	    $formmail->withfrom=1;
-	    $liste=$langs->trans("AllRecipientSelected");
-	    if (count($listofselectedthirdparties) == 1)
-	    {
-	        $liste=array();
-	        $thirdpartyid=array_shift($listofselectedthirdparties);
-	        $soc=new Societe($db);
-	        $soc->fetch($thirdpartyid);
-	        foreach ($soc->thirdparty_and_contact_email_array(1) as $key=>$value)
-	        {
-	            $liste[$key]=$value;
-	        }
-	        $formmail->withtoreadonly=0;
-	    }
-	    else
-	    {
-	        $formmail->withtoreadonly=1;
-	    }
-	    $formmail->withto=$liste;
-	    $formmail->withtofree=0;
-	    $formmail->withtocc=1;
-	    $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC;
-	    $formmail->withtopic=$langs->transnoentities($topicmail, '__REF__', '__REFCLIENT__');
-	    $formmail->withfile=$langs->trans("OnlyPDFattachmentSupported");
-	    $formmail->withbody=1;
-	    $formmail->withdeliveryreceipt=1;
-	    $formmail->withcancel=1;
-	    // Tableau des substitutions
-	    $formmail->substit['__REF__']='__REF__';	// We want to keep the tag
-	    $formmail->substit['__SIGNATURE__']=$user->signature;
-	    $formmail->substit['__REFCLIENT__']='__REFCLIENT__';	// We want to keep the tag
-	    $formmail->substit['__PERSONALIZED__']='';
-	    $formmail->substit['__CONTACTCIVNAME__']='';
-
-	    // Tableau des parametres complementaires du post
-	    $formmail->param['action']=$action;
-	    $formmail->param['models']=$modelmail;
-	    $formmail->param['models_id']=GETPOST('modelmailselected','int');
-	    $formmail->param['id']=join(',',$arrayofselected);
-	    //$formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-
-	    print $formmail->get_form();
-
-	    dol_fiche_end();
 	}
-	elseif ($massaction == 'createbills')
+
+	if ($massaction == 'createbills')
 	{
 	    //var_dump($_REQUEST);
 	    print '<input type="hidden" name="massaction" value="confirm_createbills">';

htdocs/holiday/card.php

@@ -823,7 +823,7 @@ if (empty($id) || $action == 'add' || $action == 'request' || $action == 'create
 
         dol_fiche_head();
 
-        //print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br /><br />';
+        //print '<span>'.$langs->trans('DelayToRequestCP',$object->getConfCP('delayForRequest')).'</span><br><br>';
 
         print '<table class="border" width="100%">';
         print '<tbody>';
@@ -1281,14 +1281,14 @@ else
             } else {
                 print '<div class="tabBar">';
                 print $langs->trans('ErrorUserViewCP');
-                print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+                print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
                 print '</div>';
             }
 
         } else {
             print '<div class="tabBar">';
             print $langs->trans('ErrorIDFicheCP');
-            print '<br /><br /><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+            print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
             print '</div>';
         }
 

htdocs/install/check.php

@@ -365,7 +365,7 @@ else
 		print $langs->trans("InstallEasy")." ";
 		print $langs->trans("ChooseYourSetupMode");
 
-        print '<br /><br />';
+        print '<br><br>';
 
 		$foundrecommandedchoice=0;
 
@@ -534,13 +534,13 @@ else
 
         if (count($notavailable_choices)) {
 
-            print '<br />';
+            print '<br>';
             print '<div id="AShowChoices">';
             print '<img src="../theme/eldy/img/1downarrow.png"> <a href="#">'.$langs->trans('ShowNotAvailableOptions').'</a>';
             print '</div>';
 
             print '<div id="navail_choices" style="display:none">';
-            print '<br />';
+            print '<br>';
             print '<table width="100%" class="listofchoices">';
             foreach ($notavailable_choices as $choice) {
                 print $choice;

htdocs/install/mysql/data/llx_c_action_trigger.sql

@@ -50,8 +50,12 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',9);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CREATE','Supplier order created','Executed when a supplier order is created','order_supplier',11);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10);
+--insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_CREATE','Supplier order created','Executed when a supplier order is created','order_supplier',11);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',12);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',13);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',13);
@@ -65,6 +69,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22);