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

Conflicts: htdocs/core/class/extrafields.class.php
Dolibarr · Feb 4, 2018 · 0cc6654 · 0cc6654
2 parents aff6bce + 5a60921
commit 0cc6654
Show file tree

Hide file tree

Showing 17 changed files with 526 additions and 43 deletions.
diff --git a/htdocs/api/admin/explorer.php b/htdocs/api/admin/explorer.php
@@ -87,7 +87,13 @@
                     $part = 'compta/facture';
 					$obj = 'facture';
 				}
-                if (empty($conf->$module->enabled)) $enabled=false;
+                if ($module == 'ficheinter') {
+                                       $obj = 'fichinter';
+                                       $part = 'fichinter';
+                                       $module='fichinter';
+                               }
+
+		if (empty($conf->$module->enabled)) $enabled=false;
 
                 if ($enabled)
                 {

diff --git a/htdocs/api/index.php b/htdocs/api/index.php
@@ -145,6 +145,7 @@
                     $modulenameforenabled = $module;
                     if ($module == 'propale') { $modulenameforenabled='propal'; }
                     if ($module == 'supplierproposal') { $modulenameforenabled='supplier_proposal'; }
+                    if ($module == 'ficheinter') { $modulenameforenabled='ficheinter'; }
 
                     dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);
 
@@ -217,7 +218,7 @@
     $moduledirforclass = getModuleDirForApiClass($module);
 
     // Load a dedicated API file
-    dol_syslog("Load a dedicated API file moduledirforclass=".$moduledirforclass);
+    dol_syslog("Load a dedicated API file module=".$module." moduledirforclass=".$moduledirforclass);
 
 	$tmpmodule = $module;
 	if ($tmpmodule != 'api')
@@ -229,6 +230,11 @@
 		$classfile = 'supplier_orders';
 	if ($module == 'supplierinvoices')
 		$classfile = 'supplier_invoices';
+	if ($module == 'ficheinter')
+		$classfile = 'interventions';
+	if ($module == 'interventions')
+		$classfile = 'interventions';
+
 	$dir_part_file = dol_buildpath('/' . $moduledirforclass . '/class/api_' . $classfile . '.class.php', 0, 2);
 
 	$classname = ucwords($module);

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
@@ -1633,6 +1633,7 @@ public function sendEmailsReminder()
 
     	if (empty($conf->global->AGENDA_REMINDER_EMAIL))
     	{
+    		$langs->load("agenda");
     		$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
     		return 0;
     	}

diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
@@ -472,7 +472,7 @@ function delete($id)
     /**
      * Validate an order
      *
-	 * If you get a bad value for param notrigger check that ou provide this in body
+	 * If you get a bad value for param notrigger check, provide this in body
      * {
      *   "idwarehouse": 0,
      *   "notrigger": 0

diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
@@ -387,7 +387,7 @@
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
-
+$options = array();
 
 if ($id > 0 || ! empty($ref))
 {
@@ -398,7 +398,6 @@
     // Load bank groups
     require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
     $bankcateg = new BankCateg($db);
-    $options = array();
 
     foreach ($bankcateg->fetchAll() as $bankcategory) {
         $options[$bankcategory->id] = $bankcategory->label;
@@ -531,7 +530,6 @@
 $resql = $db->query($sql);
 if ($resql)
 {
-	$var=True;
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
@@ -569,14 +567,12 @@
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
 	{
-//	    print '<table class="noborder" width="100%">';
-//	    print '<tr '.$bcnd[false].'>';
-//	    print '<td>';
 	    print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
 	    print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
 	    print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve')?GETPOST('num_releve'):'').'" size="10">';  // The only default value is value we just entered
 	    print '</div>';
-	    if ($options) {
+	    if (is_array($options) && count($options))
+	    {
 	        print $langs->trans("EventualyAddCategory").': ';
 	        print Form::selectarray('cat', $options, GETPOST('cat'), 1);
 	    }
@@ -629,7 +625,6 @@
     ';
         }
 	    print '<br><br>';
-//	    print '</td></tr></table>';
 	}
 
 	// Form to add a transaction with no invoice
@@ -663,7 +658,8 @@
 		print '<tr>';
 		print '<td>';
 		print '<input name="label" class="flat minwidth200" type="text" value="'.GETPOST("label","alpha").'">';
-		if (is_array($options) && count($options)) {
+		if (is_array($options) && count($options))
+		{
 			print '<br>'.$langs->trans("Rubrique").': ';
 			print Form::selectarray('cat1', $options, GETPOST('cat1'), 1);
 		}

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2004-2014	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2014	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2006		Andre Cianfarani		<acianfa@free.fr>
- * Copyright (C) 2010-2015	Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2010-2017	Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013       Christophe Battarel     <christophe.battarel@altairis.fr>
  * Copyright (C) 2013-2014  Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016	Ferran Marcet		  	<fmarcet@2byte.es>
@@ -781,6 +781,30 @@
 	else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->contrat->creer)
 	{
 		$result = $object->validate($user);
+
+		if ($result > 0)
+		{
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (! empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model=$object->modelpdf;
+				$ret = $object->fetch($id); // Reload to get new records
+
+				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+		else
+		{
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	else if ($action == 'reopen' && $user->rights->contrat->creer)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -1273,22 +1273,27 @@ function fetch_origin()
 	}
 
 	/**
-	 *    	Load object from specific field
-	 *
-	 *    	@param	string	$table		Table element or element line
-	 *    	@param	string	$field		Field selected
-	 *    	@param	string	$key		Import key
-	 *		@return	int					<0 if KO, >0 if OK
-	 */
-	function fetchObjectFrom($table,$field,$key)
+     *  Load object from specific field
+     *
+     *  @param	string	$table		Table element or element line
+     *  @param	string	$field		Field selected
+     *  @param	string	$key		Import key
+     *  @param	string	$element	Element name
+     *	@return	int					<0 if KO, >0 if OK
+     */
+	function fetchObjectFrom($table, $field, $key, $element = null)
 	{
 		global $conf;
 
 		$result=false;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
 		$sql.= " WHERE ".$field." = '".$key."'";
-		$sql.= " AND entity = ".$conf->entity;
+		if (! empty($element)) {
+			$sql.= " AND entity IN (".getEntity($element).")";
+		} else {
+			$sql.= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
 		$resql = $this->db->query($sql);

diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
@@ -404,13 +404,13 @@ function send($notifcode, $object)
 								break;
 							case 'FICHINTER_ADD_CONTACT':
 								$link='/fichinter/card.php?id='.$object->id;
-								$dir_output = $conf->facture->dir_output;
+								$dir_output = $conf->ficheinter->dir_output;
 								$object_type = 'ficheinter';
 								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionAddedContact",$object->ref);
 								break;
 							case 'FICHINTER_VALIDATE':
 								$link='/fichinter/card.php?id='.$object->id;
-								$dir_output = $conf->facture->dir_output;
+								$dir_output = $conf->ficheinter->dir_output;
 								$object_type = 'ficheinter';
 								$mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref);
 								break;
@@ -664,8 +664,9 @@ function send($notifcode, $object)
 					}
 					dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval);
 					$sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto);
-					$sendto = preg_replace('/^[\s,]+/','',$sendto);	// Clean start of string
-					$sendto = preg_replace('/[\s,]+$/','',$sendto);	// Clean end of string
+					$sendto = preg_replace('/,\s*,/', ',', $sendto);	// in some case you can have $sendto like "email, __SUPERVISOREMAIL__ , otheremail" then you have "email,  , othermail" and it's not valid
+					$sendto = preg_replace('/^[\s,]+/', '', $sendto);	// Clean start of string
+					$sendto = preg_replace('/[\s,]+$/', '', $sendto);	// Clean end of string
 				}
 
 				if ($sendto)

diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
@@ -2258,6 +2258,9 @@ function getModuleDirForApiClass($module)
     elseif ($module == 'users') {
         $moduledirforclass = 'user';
     }
+    elseif ($module == 'ficheinter' || $module == 'interventions') {
+    	$moduledirforclass = 'fichinter';
+    }
 
     return $moduledirforclass;
 }