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

Conflicts:
	htdocs/core/class/extrafields.class.php

htdocs/api/admin/explorer.php

@@ -87,6 +87,12 @@ foreach ($modulesdir as $dir)
                     $part = 'compta/facture';
 					$obj = 'facture';
 				}
+                if ($module == 'ficheinter') {
+                                       $obj = 'fichinter';
+                                       $part = 'fichinter';
+                                       $module='fichinter';
+                               }
+
 		if (empty($conf->$module->enabled)) $enabled=false;
 
                 if ($enabled)

htdocs/api/index.php

@@ -145,6 +145,7 @@ if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' ||
                     $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 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
     $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 @@ if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 		$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);

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

@@ -1633,6 +1633,7 @@ class ActionComm extends CommonObject
 
     	if (empty($conf->global->AGENDA_REMINDER_EMAIL))
     	{
+    		$langs->load("agenda");
     		$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
     		return 0;
     	}

htdocs/commande/class/api_orders.class.php

@@ -472,7 +472,7 @@ class Orders extends DolibarrApi
     /**
      * 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

htdocs/compta/bank/bankentries_list.php

@@ -387,7 +387,7 @@ if ($optioncss != '')       $param.='&optioncss='.$optioncss;
 // 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 @@ if ($id > 0 || ! empty($ref))
     // 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 @@ dol_syslog('compta/bank/bankentries_list.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql)
 {
-	$var=True;
 	$num = $db->num_rows($resql);
 
 	$arrayofselected=is_array($toselect)?$toselect:array();
@@ -569,14 +567,12 @@ if ($resql)
 	// 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 @@ if ($resql)
     ';
         }
 	    print '<br><br>';
-//	    print '</td></tr></table>';
 	}
 
 	// Form to add a transaction with no invoice
@@ -663,7 +658,8 @@ if ($resql)
 		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);
 		}

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 @@ if (empty($reshook))
 	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)

htdocs/core/class/commonobject.class.php

@@ -1278,9 +1278,10 @@ abstract class CommonObject
      *  @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)
+	function fetchObjectFrom($table, $field, $key, $element = null)
 	{
 		global $conf;
 
@@ -1288,7 +1289,11 @@ abstract class CommonObject
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$table;
 		$sql.= " WHERE ".$field." = '".$key."'";
+		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);

htdocs/core/class/notify.class.php

@@ -404,13 +404,13 @@ class Notify
 								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 @@ class Notify
 					}
 					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);	// 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 end of string
+					$sendto = preg_replace('/^[\s,]+/', '', $sendto);	// Clean start of string
+					$sendto = preg_replace('/[\s,]+$/', '', $sendto);	// Clean end of string
 				}
 
 				if ($sendto)

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;
 }

htdocs/fichinter/class/api_interventions.class.php

@@ -0,0 +1,424 @@
+<?php
+/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2016	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/>.
+ */
+
+ use Luracast\Restler\RestException;
+
+ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+
+/**
+ * API class for fichinters
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class Interventions extends DolibarrApi
+{
+
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDS = array(
+      'socid',
+      'fk_project',
+      'description'
+    );
+
+    /**
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDSLINE = array(
+      'description',
+      'date',
+      'duree'
+    );
+
+    /**
+     * @var fichinter $fichinter {@type fichinter}
+     */
+    public $fichinter;
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+		global $db, $conf;
+		$this->db = $db;
+        $this->fichinter = new Fichinter($this->db);
+    }
+
+    /**
+     * Get properties of a Expense Report object
+     *
+     * Return an array with Expense Report informations
+     *
+     * @param       int         $id         ID of Expense Report
+     * @return 	    array|mixed             Data without useless information
+     *
+     * @throws 	RestException
+     */
+    function get($id)
+    {
+    	if(! DolibarrApiAccess::$user->rights->ficheinter->lire) {
+    		throw new RestException(401);
+    	}
+
+    	$result = $this->fichinter->fetch($id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'Intervention report not found');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('fichinter',$this->fichinter->id)) {
+    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+    	}
+
+    	$this->fichinter->fetchObjectLinked();
+    	return $this->_cleanObjectDatas($this->fichinter);
+    }
+
+    /**
+     * List of interventions
+     *
+     * Return a list of interventions
+     *
+     * @param string	       $sortfield	        Sort field
+     * @param string	       $sortorder	        Sort order
+     * @param int	       $limit		        Limit for list
+     * @param int	       $page		        Page number
+     * @param string   	       $thirdparty_ids	        Thirdparty ids to filter orders of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
+     * @param string           $sqlfilters              Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+     * @return  array                                   Array of order objects
+     *
+     * @throws RestException
+     */
+    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
+        global $db, $conf;
+
+        $obj_ret = array();
+
+        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+        $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
+
+        // If the internal user must only see his customers, force searching by him
+        $search_sale = 0;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+
+        $sql = "SELECT t.rowid";
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        $sql.= " FROM ".MAIN_DB_PREFIX."fichinter as t";
+
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+
+        $sql.= ' WHERE t.entity IN ('.getEntity('fichinter').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
+        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
+        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        // Insert sale filter
+        if ($search_sale > 0)
+        {
+            $sql .= " AND sc.fk_user = ".$search_sale;
+        }
+        // Add sql filters
+        if ($sqlfilters)
+        {
+            if (! DolibarrApi::_checkFilters($sqlfilters))
+            {
+                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+            }
+	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+        }
+
+        $sql.= $db->order($sortfield, $sortorder);
+        if ($limit)	{
+            if ($page < 0)
+            {
+                $page = 0;
+            }
+            $offset = $limit * $page;
+
+            $sql.= $db->plimit($limit + 1, $offset);
+        }
+
+        dol_syslog("API Rest request");
+        $result = $db->query($sql);
+
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            $min = min($num, ($limit <= 0 ? $num : $limit));
+            while ($i < $min)
+            {
+                $obj = $db->fetch_object($result);
+                $fichinter_static = new Fichinter($db);
+                if($fichinter_static->fetch($obj->rowid)) {
+                	$obj_ret[] = $this->_cleanObjectDatas($fichinter_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve fichinter list : '.$db->lasterror());
+        }
+        if( ! count($obj_ret)) {
+            throw new RestException(404, 'No finchinter found');
+        }
+		return $obj_ret;
+    }
+
+    /**
+     * Create intervention object
+     *
+     * @param   array   $request_data   Request data
+     * @return  int     ID of intervention
+     */
+    function post($request_data = NULL)
+    {
+      if(! DolibarrApiAccess::$user->rights->ficheinter->creer) {
+			  throw new RestException(401, "Insuffisant rights");
+		  }
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+        foreach($request_data as $field => $value) {
+            $this->fichinter->$field = $value;
+        }
+
+        if ($this->fichinter->create(DolibarrApiAccess::$user) < 0) {
+            throw new RestException(500, "Error creating fichinter", array_merge(array($this->fichinter->error), $this->fichinter->errors));
+        }
+
+        return $this->fichinter->id;
+    }
+
+
+    /**
+     * Get lines of an intervention
+     *
+     * @param int   $id             Id of intervention
+     *
+     * @url	GET {id}/lines
+     *
+     * @return int
+     */
+    /* TODO
+    function getLines($id) {
+    	if(! DolibarrApiAccess::$user->rights->ficheinter->lire) {
+    		throw new RestException(401);
+    	}
+
+    	$result = $this->fichinter->fetch($id);
+    	if( ! $result ) {
+    		throw new RestException(404, 'Intervention not found');
+    	}
+
+    	if( ! DolibarrApi::_checkAccessToResource('fichinter',$this->fichinter->id)) {
+    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+    	}
+    	$this->fichinter->getLinesArray();
+    	$result = array();
+    	foreach ($this->fichinter->lines as $line) {
+    		array_push($result,$this->_cleanObjectDatas($line));
+    	}
+    	return $result;
+    }
+	*/
+
+    /**
+     * Add a line to given intervention
+     *
+     * @param 	int   	$id             Id of intervention to update
+     * @param   array   $request_data   Request data
+     *
+     * @url     POST {id}/lines
+     *
+     * @return  int
+     */
+    function postLine($id, $request_data = NULL)
+    {
+        if(! DolibarrApiAccess::$user->rights->ficheinter->creer) {
+                          throw new RestException(401, "Insuffisant rights");
+                  }
+        // Check mandatory fields
+        $result = $this->_validateLine($request_data);
+
+        foreach($request_data as $field => $value) {
+            $this->fichinter->$field = $value;
+        }
+
+        if( ! $result ) {
+            throw new RestException(404, 'Intervention not found');
+        }
+
+                if( ! DolibarrApi::_checkAccessToResource('fichinter',$this->fichinter->id)) {
+                        throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+                }
+
+        $updateRes = $this->fichinter->addLine(
+                DolibarrApiAccess::$user,
+                $id,
+                $this->fichinter->description,
+                $this->fichinter->date,
+                $this->fichinter->duree
+        );
+
+        if ($updateRes > 0) {
+        	return $updateRes;
+        }
+        else {
+        	throw new RestException(400, $this->fichinter->error);
+        }
+    }
+
+    /**
+     * Validate an intervention
+     *
+     * If you get a bad value for param notrigger check, provide this in body
+     * {
+     *   "notrigger": 0
+     * }
+     *
+     * @param   int $id             Intervention ID
+     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+     *
+     * @url POST    {id}/validate
+     *
+     * @return  array
+     */
+    function validate($id, $notrigger=0)
+    {
+        if(! DolibarrApiAccess::$user->rights->ficheinter->creer) {
+                          throw new RestException(401, "Insuffisant rights");
+                  }
+        $result = $this->fichinter->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Intervention not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('fichinter',$this->fichinter->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->fichinter->setValid(DolibarrApiAccess::$user, $notrigger);
+        if ($result == 0) {
+        	throw new RestException(304, 'Error nothing done. May be object is already validated');
+        }
+        if ($result < 0) {
+        	throw new RestException(500, 'Error when validating Intervention: '.$this->commande->error);
+        }
+
+        $this->fichinter->fetchObjectLinked();
+
+        return $this->_cleanObjectDatas($this->fichinter);
+    }
+
+    /**
+     * Close an intervention
+     *
+     * @param   int 	$id             Intervention ID
+     *
+     * @url POST    {id}/close
+     *
+     * @return  array
+     */
+    function closeFichinter($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->ficheinter->creer)
+        {
+            throw new RestException(401, "Insuffisant rights");
+        }
+        $result = $this->fichinter->fetch($id);
+        if (! $result) {
+            throw new RestException(404, 'Intervention not found');
+        }
+
+        if (! DolibarrApi::_checkAccessToResource('fichinter',$this->fichinter->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->fichinter->setStatut(3);
+
+        if ($result == 0) {
+        	throw new RestException(304, 'Error nothing done. May be object is already closed');
+        }
+        if ($result < 0) {
+        	throw new RestException(500, 'Error when closing Intervention: '.$this->fichinter->error);
+        }
+
+        $this->fichinter->fetchObjectLinked();
+
+        return $this->_cleanObjectDatas($this->fichinter);
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param array $data   Data to validate
+     * @return array
+     *
+     * @throws RestException
+     */
+    function _validate($data)
+    {
+        $fichinter = array();
+        foreach (Interventions::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $fichinter[$field] = $data[$field];
+        }
+        return $fichinter;
+    }
+
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object) {
+
+    	$object = parent::_cleanObjectDatas($object);
+
+    	unset($object->statuts_short);
+    	unset($object->statuts_logo);
+    	unset($object->statuts);
+
+    	return $object;
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param array $data   Data to validate
+     * @return array
+     *
+     * @throws RestException
+     */
+    function _validateLine($data)
+    {
+        $fichinter = array();
+        foreach (Interventions::$FIELDSLINE as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $fichinter[$field] = $data[$field];
+        }
+        return $fichinter;
+    }
+
+
+}

htdocs/fichinter/class/fichinter.class.php

@@ -157,7 +157,7 @@ class Fichinter extends CommonObject
 	 */
 	function create($user, $notrigger=0)
 	{
-		global $conf, $user, $langs;
+		global $conf, $langs;
 
 		dol_syslog(get_class($this)."::create ref=".$this->ref);
 

htdocs/fourn/card.php

@@ -101,6 +101,21 @@ if (empty($reshook))
 		$result=$object->setPaymentMethods(GETPOST('mode_reglement_supplier_id','int'));
 		if ($result < 0) dol_print_error($db,$object->error);
 	}
+	if ($action == 'update_extras') {
+        $object->fetch($id);
+
+        // Fill array 'array_options' with data from update form
+        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
+        $ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute'));
+		
+        if ($ret < 0) $error++;
+        if (! $error)
+        {
+            $result = $object->insertExtraFields();
+            if ($result < 0) $error++;
+        }
+        if ($error) $action = 'edit_extras';
+    }
 }
 
 

htdocs/install/mysql/tables/llx_commandedet.sql

@@ -45,7 +45,7 @@ create table llx_commandedet
   total_localtax1				double(24,8) DEFAULT 0,          -- Total LocalTax1 
   total_localtax2				double(24,8) DEFAULT 0,          -- Total LocalTax2
   total_ttc						double(24,8) DEFAULT 0,          -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  product_type					integer      DEFAULT 0,
+  product_type					integer      DEFAULT 0,          -- 0 or 1. Value 9 may be used by some modules (amount of line may not be included into generated discount if value is 9).
   date_start					datetime     DEFAULT NULL,       -- date debut si service
   date_end						datetime     DEFAULT NULL,       -- date fin si service
   info_bits						integer      DEFAULT 0,          -- TVA NPR ou non
@@ -53,7 +53,7 @@ create table llx_commandedet
   buy_price_ht					double(24,8) DEFAULT 0,          -- buying price
   fk_product_fournisseur_price	integer      DEFAULT NULL,       -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
   
-  special_code					integer      DEFAULT 0,      -- code pour les lignes speciales
+  special_code					integer      DEFAULT 0,          -- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
   rang							integer      DEFAULT 0,
   fk_unit						integer      DEFAULT NULL,       -- lien vers table des unités
   import_key					varchar(14),

htdocs/install/mysql/tables/llx_facturedet.sql

@@ -47,7 +47,7 @@ create table llx_facturedet
   total_localtax1				double(24,8) DEFAULT 0,				-- Total LocalTax1 for total quantity of line
   total_localtax2				double(24,8) DEFAULT 0,				-- Total LocalTax2 for total quantity of line
   total_ttc						double(24,8),						-- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  product_type					integer    DEFAULT 0,
+  product_type					integer    DEFAULT 0,				-- 0 or 1. Value 9 may be used by some modules (amount of line may not be included into generated discount if value is 9).
   date_start					datetime   DEFAULT NULL,			-- date start if service
   date_end						datetime   DEFAULT NULL,			-- date end if service
   info_bits						integer    DEFAULT 0,				-- VAT NPR or not (for france only)
@@ -57,7 +57,7 @@ create table llx_facturedet
 
   fk_code_ventilation			integer    DEFAULT 0 NOT NULL,		-- Id in table llx_accounting_bookeeping to know accounting account for product line
   
-  special_code					integer    DEFAULT 0,			    -- code pour les lignes speciales
+  special_code					integer    DEFAULT 0,				-- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
   rang							integer    DEFAULT 0,				-- position of line
   fk_contract_line  			integer NULL,						-- id of contract line when invoice comes from contract lines
   import_key					varchar(14),

htdocs/install/mysql/tables/llx_propaldet.sql

@@ -44,7 +44,7 @@ create table llx_propaldet
   total_localtax1					double(24,8) DEFAULT 0,          -- Total localtax1
   total_localtax2					double(24,8) DEFAULT 0,          -- Total localtax2
   total_ttc							double(24,8) DEFAULT 0,          -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  product_type						integer    DEFAULT 0,
+  product_type						integer    DEFAULT 0,            -- 0 or 1. Value 9 may be used by some modules (amount of line may not be included into generated discount if value is 9).
   date_start						datetime   DEFAULT NULL,         -- date debut si service
   date_end							datetime   DEFAULT NULL,         -- date fin si service
   info_bits							integer      DEFAULT 0,          -- TVA NPR ou non
@@ -52,7 +52,7 @@ create table llx_propaldet
   buy_price_ht						double(24,8) DEFAULT 0,          -- buying price
   fk_product_fournisseur_price		integer      DEFAULT NULL,       -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
   
-  special_code						integer      DEFAULT 0,          -- code pour les lignes speciales
+  special_code						integer      DEFAULT 0,          -- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
   rang								integer      DEFAULT 0,          -- ordre affichage sur la propal
   fk_unit           integer      DEFAULT NULL,           -- lien vers table des unités
   

htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php

@@ -211,6 +211,7 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 		        // Contracts
 		    case 'CONTRACT_CREATE':
 		    case 'CONTRACT_ACTIVATE':
+		    case 'CONTRACT_MODIFY':
 		    case 'CONTRACT_CANCEL':
 		    case 'CONTRACT_CLOSE':
 		    case 'CONTRACT_DELETE':

htdocs/societe/class/societe.class.php

@@ -1153,6 +1153,7 @@ class Societe extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as te ON s.fk_typent = te.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON s.fk_incoterms = i.rowid';
+
 		$sql .= ' WHERE s.entity IN ('.getEntity($this->element).')';
 		if ($rowid)   $sql .= ' AND s.rowid = '.$rowid;
 		if ($ref)     $sql .= " AND s.nom = '".$this->db->escape($ref)."'";