alxarafe / alixar

dolibarr/htdocs/societe/class/api_thirdparties.class.php

Indentation +1621 added lines, -1621 removed lines

@@ -28,1644 +28,1644 @@
  */
 class Thirdparties extends DolibarrApi
 {
-	/**
-	 *
-	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
-	 */
-	static $FIELDS = array(
-		'name'
-	);
-
-	/**
-	 * @var Societe $company {@type Societe}
-	 */
-	public $company;
-
-	/**
-	 * Constructor
-	 */
-	function __construct()
-	{
-		global $db, $conf;
-		$this->db = $db;
-
-		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-
-		$this->company = new Societe($this->db);
-
-		if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
-			static::$FIELDS[] = 'email';
-		}
-	}
-
-	/**
-	 * Get properties of a thirdparty object
-	 *
-	 * Return an array with thirdparty informations
-	 *
-	 * @param 	int 	$id ID of thirdparty
-	 * @return 	array|mixed data without useless information
-	 *
-	 * @throws 	RestException
-	 */
-	function get($id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
-		} else {
-			$filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
-			$filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
-		}
-
-		$absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
-		$absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
-		$this->company->absolute_discount = price2num($absolute_discount, 'MT');
-		$this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * List thirdparties
-	 *
-	 * Get a list of thirdparties
-	 *
-	 * @param   string  $sortfield  Sort field
-	 * @param   string  $sortorder  Sort order
-	 * @param   int     $limit      Limit for list
-	 * @param   int     $page       Page number
-	 * @param   int     $mode       Set to 1 to show only customers
-	 *                              Set to 2 to show only prospects
-	 *                              Set to 3 to show only those are not customer neither prospect
-	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
-	 * @return  array               Array of thirdparty objects
-	 */
-	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $sqlfilters = '')
+    /**
+     *
+     * @var array   $FIELDS     Mandatory fields, checked when create and update object
+     */
+    static $FIELDS = array(
+        'name'
+    );
+
+    /**
+     * @var Societe $company {@type Societe}
+     */
+    public $company;
+
+    /**
+     * Constructor
+     */
+    function __construct()
     {
-		global $db, $conf;
-
-		$obj_ret = array();
-
-		// case of external user, we force socids
-		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
-
-		// 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."societe 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.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-		$sql.= " WHERE t.fk_stcomm = st.id";
-		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql.= " AND t.client IN (0)";
-		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
-		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socid) $sql.= " AND t.rowid 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);
-		}
-
-		$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);
-				$soc_static = new Societe($db);
-				if($soc_static->fetch($obj->rowid)) {
-					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
-				}
-				$i++;
-			}
-		}
-		else {
-			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
-		}
-		if( ! count($obj_ret)) {
-			throw new RestException(404, 'Thirdparties not found');
-		}
-		return $obj_ret;
-	}
-
-	/**
-	 * Create thirdparty object
-	 *
-	 * @param array $request_data   Request datas
-	 * @return int  ID of thirdparty
-	 */
-	function post($request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-		// Check mandatory fields
-		$result = $this->_validate($request_data);
-
-		foreach($request_data as $field => $value) {
-			$this->company->$field = $value;
-		}
-		if ($this->company->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
-
-		return $this->company->id;
-	}
-
-	/**
-	 * Update thirdparty
-	 *
-	 * @param int   $id             Id of thirdparty to update
-	 * @param array $request_data   Datas
-	 * @return int
-	 */
-	function put($id, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		foreach($request_data as $field => $value) {
-			if ($field == 'id') continue;
-			$this->company->$field = $value;
-		}
-
-		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-			return $this->get($id);
-
-		return false;
-	}
-
-	/**
-	 * Merge a thirdparty into another one.
-	 *
-	 * Merge content (properties, notes) and objects (like invoices, events, orders, proposals, ...) of a thirdparty into a target thirdparty,
-	 * then delete the merged thirdparty.
-	 * If a property has a defined value both in thirdparty to delete and thirdparty to keep, the value into the thirdparty to
-	 * delete will be ignored, the value of target thirdparty will remain, except for notes (content is concatenated).
-	 *
-	 * @param int   $id             ID of thirdparty to keep (the target thirdparty)
-	 * @param int   $idtodelete     ID of thirdparty to remove (the thirdparty to delete), once data has been merged into the target thirdparty.
-	 * @return int
-	 *
-	 * @url PUT {id}/merge/{idtodelete}
-	 */
-	function merge($id, $idtodelete)
-	{
-		global $db, $hookmanager;
-
-		$error = 0;
-
-		if ($id == $idtodelete)
-		{
-			throw new RestException(400, 'Try to merge a thirdparty into itself');
-		}
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);	// include the fetch of extra fields
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$this->companytoremove = new Societe($db);
-
-		$result = $this->companytoremove->fetch($idtodelete);	// include the fetch of extra fields
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->companytoremove->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$soc_origin = $this->companytoremove;
-		$object = $this->company;
-		$user = DolibarrApiAccess::$user;
-
-
-		// Call same code than into action 'confirm_merge'
-
-
-		$db->begin();
-
-		// Recopy some data
-		$object->client = $object->client | $soc_origin->client;
-		$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-		$listofproperties=array(
-			'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
-			'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
-			'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
-			'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
-			'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
-			'model_pdf', 'fk_projet'
-		);
-		foreach ($listofproperties as $property)
-		{
-			if (empty($object->$property)) $object->$property = $soc_origin->$property;
-		}
-
-		// Concat some data
-		$listofproperties=array(
-			'note_public', 'note_private'
-		);
-		foreach ($listofproperties as $property)
-		{
-			$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
-		}
-
-		// Merge extrafields
-		if (is_array($soc_origin->array_options))
-		{
-			foreach ($soc_origin->array_options as $key => $val)
-			{
-				if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
-			}
-		}
-
-		// Merge categories
-		$static_cat = new Categorie($db);
-		$custcats = $static_cat->containing($soc_origin->id, 'customer', 'id');
-		$object->setCategories($custcats, 'customer');
-		$suppcats = $static_cat->containing($soc_origin->id, 'supplier', 'id');
-		$object->setCategories($suppcats, 'supplier');
-
-		// If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
-		if ($soc_origin->code_client == $object->code_client
-			|| $soc_origin->code_fournisseur == $object->code_fournisseur
-			|| $soc_origin->barcode == $object->barcode)
-		{
-			dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
-			$soc_origin->code_client = '';
-			$soc_origin->code_fournisseur = '';
-			$soc_origin->barcode = '';
-			$soc_origin->update($soc_origin->id, $user, 0, 1, 1, 'merge');
-		}
-
-		// Update
-		$result = $object->update($object->id, $user, 0, 1, 1, 'merge');
-		if ($result < 0)
-		{
-			$error++;
-		}
-
-		// Move links
-		if (! $error)
-		{
-			$objects = array(
-				'Adherent' => '/adherents/class/adherent.class.php',
-				'Societe' => '/societe/class/societe.class.php',
-				'Categorie' => '/categories/class/categorie.class.php',
-				'ActionComm' => '/comm/action/class/actioncomm.class.php',
-				'Propal' => '/comm/propal/class/propal.class.php',
-				'Commande' => '/commande/class/commande.class.php',
-				'Facture' => '/compta/facture/class/facture.class.php',
-				'FactureRec' => '/compta/facture/class/facture-rec.class.php',
-				'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
-				'Contact' => '/contact/class/contact.class.php',
-				'Contrat' => '/contrat/class/contrat.class.php',
-				'Expedition' => '/expedition/class/expedition.class.php',
-				'Fichinter' => '/fichinter/class/fichinter.class.php',
-				'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
-				'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
-				'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
-				'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
-				'Livraison' => '/livraison/class/livraison.class.php',
-				'Product' => '/product/class/product.class.php',
-				'Project' => '/projet/class/project.class.php',
-				'User' => '/user/class/user.class.php',
-			);
-
-			//First, all core objects must update their tables
-			foreach ($objects as $object_name => $object_file)
-			{
-				require_once DOL_DOCUMENT_ROOT.$object_file;
-
-				if (!$errors && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
-				{
-					$errors++;
-					//setEventMessages($db->lasterror(), null, 'errors');
-				}
-			}
-		}
-
-		// External modules should update their ones too
-		if (!$errors)
-		{
-			$reshook = $hookmanager->executeHooks('replaceThirdparty', array(
-				'soc_origin' => $soc_origin->id,
-				'soc_dest' => $object->id
-			), $soc_dest, $action);
-
-			if ($reshook < 0)
-			{
-				//setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-				$errors++;
-			}
-		}
-
-
-		if (! $error)
-		{
-			$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
-
-			// Call trigger
-			$result=$object->call_trigger('COMPANY_MODIFY',$user);
-			if ($result < 0)
-			{
-				//setEventMessages($object->error, $object->errors, 'errors');
-				$error++;
-			}
-			// End call triggers
-		}
-
-		if (! $error)
-		{
-			//We finally remove the old thirdparty
-			if ($soc_origin->delete($soc_origin->id, $user) < 1)
-			{
-				$errors++;
-			}
-		}
-
-		// End of merge
-
-		if ($error)
-		{
-			$db->rollback();
-
-			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
-		}
-		else
-		{
-			$db->commit();
-		}
-
-		return $this->get($id);
-	}
-
-	/**
-	 * Delete thirdparty
-	 *
-	 * @param int $id   Thirparty ID
-	 * @return integer
-	 */
-	function delete($id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
-			throw new RestException(401);
-		}
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		return $this->company->delete($id);
-	}
-
-	/**
-	 * Get customer categories for a thirdparty
-	 *
-	 * @param int		$id         ID of thirdparty
-	 * @param string	$sortfield	Sort field
-	 * @param string	$sortorder	Sort order
-	 * @param int		$limit		Limit for list
-	 * @param int		$page		Page number
-	 *
-	 * @return mixed
-	 *
-	 * @url GET {id}/categories
-	 */
-	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result )
-		{
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$categories = new Categorie($this->db);
-
-		$result = $categories->getListForItem($id, 'customer', $sortfield, $sortorder, $limit, $page);
-
-		if (is_numeric($result) && $result < 0)
-		{
-			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
-		}
-
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
-		{
-			return array();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Add a customer category to a thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int       $category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url POST {id}/categories/{category_id}
-	 */
-	function addCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->add_type($this->company,'customer');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * Remove the link between a customer category and the thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int		$category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url DELETE {id}/categories/{category_id}
-	 */
-	function deleteCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->del_type($this->company,'customer');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * Get supplier categories for a thirdparty
-	 *
-	 * @param int		$id         ID of thirdparty
-	 * @param string	$sortfield	Sort field
-	 * @param string	$sortorder	Sort order
-	 * @param int		$limit		Limit for list
-	 * @param int		$page		Page number
-	 *
-	 * @return mixed
-	 *
-	 * @url GET {id}/supplier_categories
-	 */
-	function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
-	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result )
-		{
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$categories = new Categorie($this->db);
-
-		$result = $categories->getListForItem($id, 'supplier', $sortfield, $sortorder, $limit, $page);
-
-		if (is_numeric($result) && $result < 0)
-		{
-			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
-		}
-
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
-		{
-			return array();
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Add a supplier category to a thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int       $category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url POST {id}/supplier_categories/{category_id}
-	 */
-	function addSupplierCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->add_type($this->company,'supplier');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-	/**
-	 * Remove the link between a category and the thirdparty
-	 *
-	 * @param int		$id				Id of thirdparty
-	 * @param int		$category_id	Id of category
-	 *
-	 * @return mixed
-	 *
-	 * @url DELETE {id}/supplier_categories/{category_id}
-	 */
-	function deleteSupplierCategory($id, $category_id)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-		$category = new Categorie($this->db);
-		$result = $category->fetch($category_id);
-		if( ! $result ) {
-			throw new RestException(404, 'category not found');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$category->del_type($this->company,'supplier');
-
-		return $this->_cleanObjectDatas($this->company);
-	}
-
-
-	/**
-	 * Get outstanding proposals of thirdparty
-	 *
-	 * @param 	int 	$id			ID of the thirdparty
-	 * @param 	string 	$mode		'customer' or 'supplier'
-	 *
-	 * @url     GET {id}/outstandingproposals
-	 *
-	 * @return array  				List of outstandings proposals of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 */
-	function getOutStandingProposals($id, $mode='customer')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$result = $this->company->getOutstandingProposals($mode);
-
-		unset($result['total_ht']);
-		unset($result['total_ttc']);
-
-		return $result;
-	}
-
-
-	/**
-	 * Get outstanding orders of thirdparty
-	 *
-	 * @param 	int 	$id			ID of the thirdparty
-	 * @param 	string 	$mode		'customer' or 'supplier'
-	 *
-	 * @url     GET {id}/outstandingorders
-	 *
-	 * @return array  				List of outstandings orders of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 */
-	function getOutStandingOrder($id, $mode='customer')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$result = $this->company->getOutstandingOrders($mode);
-
-		unset($result['total_ht']);
-		unset($result['total_ttc']);
-
-		return $result;
-	}
-
-	/**
-	 * Get outstanding invoices of thirdparty
-	 *
-	 * @param 	int 	$id			ID of the thirdparty
-	 * @param 	string 	$mode		'customer' or 'supplier'
-	 *
-	 * @url     GET {id}/outstandinginvoices
-	 *
-	 * @return array  				List of outstandings invoices of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 */
-	function getOutStandingInvoices($id, $mode='customer')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-		$result = $this->company->getOutstandingBills($mode);
-
-		unset($result['total_ht']);
-		unset($result['total_ttc']);
-
-		return $result;
-	}
-
-	/**
-	 * Get fixed amount discount of a thirdparty (all sources: deposit, credit note, commercial offers...)
-	 *
-	 * @param 	int 	$id             ID of the thirdparty
-	 * @param 	string 	$filter    	Filter exceptional discount. "none" will return every discount, "available" returns unapplied discounts, "used" returns applied discounts   {@choice none,available,used}
-	 * @param   string  $sortfield  	Sort field
-	 * @param   string  $sortorder  	Sort order
-	 *
-	 * @url     GET {id}/fixedamountdiscounts
-	 *
-	 * @return array  List of fixed discount of thirdparty
-	 *
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 503
-	 */
-	function getFixedAmountDiscounts($id, $filter="none", $sortfield = "f.type", $sortorder = 'ASC')
-	{
-		$obj_ret = array();
-
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		$result = $this->company->fetch($id);
-		if( ! $result ) {
-			throw new RestException(404, 'Thirdparty not found');
-		}
-
-
-		$sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
-		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
-		$sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
-		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
-		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
-
-		$sql.= $this->db->order($sortfield, $sortorder);
-
-		$result = $this->db->query($sql);
-		if( ! $result ) {
-			throw new RestException(503, $this->db->lasterror());
-		} else {
-			$num = $this->db->num_rows($result);
-			while ( $obj = $this->db->fetch_object($result) ) {
-				$obj_ret[] = $obj;
-			}
-		}
-
-		return $obj_ret;
-	}
-
-
-
-	/**
-	 * Return list of invoices qualified to be replaced by another invoice.
-	 *
-	 * @param int   $id             Id of thirdparty
-	 *
-	 * @url     GET {id}/getinvoicesqualifiedforreplacement
-	 *
-	 * @return array
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 405
-	 */
-	function getInvoicesQualifiedForReplacement($id)
+        global $db, $conf;
+        $this->db = $db;
+
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+        require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+
+        $this->company = new Societe($this->db);
+
+        if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+            static::$FIELDS[] = 'email';
+        }
+    }
+
+    /**
+     * Get properties of a thirdparty object
+     *
+     * Return an array with thirdparty informations
+     *
+     * @param 	int 	$id ID of thirdparty
+     * @return 	array|mixed data without useless information
+     *
+     * @throws 	RestException
+     */
+    function get($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+            $filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+            $filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
+        } else {
+            $filterabsolutediscount = "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')";
+            $filtercreditnote = "fk_facture_source IS NOT NULL AND (description NOT LIKE '(DEPOSIT)%' OR description LIKE '(EXCESS RECEIVED)%')";
+        }
+
+        $absolute_discount = $this->company->getAvailableDiscounts('', $filterabsolutediscount);
+        $absolute_creditnote = $this->company->getAvailableDiscounts('', $filtercreditnote);
+        $this->company->absolute_discount = price2num($absolute_discount, 'MT');
+        $this->company->absolute_creditnote = price2num($absolute_creditnote, 'MT');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * List thirdparties
+     *
+     * Get a list of thirdparties
+     *
+     * @param   string  $sortfield  Sort field
+     * @param   string  $sortorder  Sort order
+     * @param   int     $limit      Limit for list
+     * @param   int     $page       Page number
+     * @param   int     $mode       Set to 1 to show only customers
+     *                              Set to 2 to show only prospects
+     *                              Set to 3 to show only those are not customer neither prospect
+     * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
+     * @return  array               Array of thirdparty objects
+     */
+    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $sqlfilters = '')
+    {
+        global $db, $conf;
+
+        $obj_ret = array();
+
+        // case of external user, we force socids
+        $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : '';
+
+        // 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."societe 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.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+        $sql.= " WHERE t.fk_stcomm = st.id";
+        if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
+        if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
+        if ($mode == 3) $sql.= " AND t.client IN (0)";
+        $sql.= ' AND t.entity IN ('.getEntity('societe').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+        //if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
+        if ($socid) $sql.= " AND t.rowid 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);
+        }
+
+        $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);
+                $soc_static = new Societe($db);
+                if($soc_static->fetch($obj->rowid)) {
+                    $obj_ret[] = $this->_cleanObjectDatas($soc_static);
+                }
+                $i++;
+            }
+        }
+        else {
+            throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
+        }
+        if( ! count($obj_ret)) {
+            throw new RestException(404, 'Thirdparties not found');
+        }
+        return $obj_ret;
+    }
+
+    /**
+     * Create thirdparty object
+     *
+     * @param array $request_data   Request datas
+     * @return int  ID of thirdparty
+     */
+    function post($request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+        // Check mandatory fields
+        $result = $this->_validate($request_data);
+
+        foreach($request_data as $field => $value) {
+            $this->company->$field = $value;
+        }
+        if ($this->company->create(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+
+        return $this->company->id;
+    }
+
+    /**
+     * Update thirdparty
+     *
+     * @param int   $id             Id of thirdparty to update
+     * @param array $request_data   Datas
+     * @return int
+     */
+    function put($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        foreach($request_data as $field => $value) {
+            if ($field == 'id') continue;
+            $this->company->$field = $value;
+        }
+
+        if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
+            return $this->get($id);
+
+        return false;
+    }
+
+    /**
+     * Merge a thirdparty into another one.
+     *
+     * Merge content (properties, notes) and objects (like invoices, events, orders, proposals, ...) of a thirdparty into a target thirdparty,
+     * then delete the merged thirdparty.
+     * If a property has a defined value both in thirdparty to delete and thirdparty to keep, the value into the thirdparty to
+     * delete will be ignored, the value of target thirdparty will remain, except for notes (content is concatenated).
+     *
+     * @param int   $id             ID of thirdparty to keep (the target thirdparty)
+     * @param int   $idtodelete     ID of thirdparty to remove (the thirdparty to delete), once data has been merged into the target thirdparty.
+     * @return int
+     *
+     * @url PUT {id}/merge/{idtodelete}
+     */
+    function merge($id, $idtodelete)
+    {
+        global $db, $hookmanager;
+
+        $error = 0;
+
+        if ($id == $idtodelete)
+        {
+            throw new RestException(400, 'Try to merge a thirdparty into itself');
+        }
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);	// include the fetch of extra fields
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $this->companytoremove = new Societe($db);
+
+        $result = $this->companytoremove->fetch($idtodelete);	// include the fetch of extra fields
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->companytoremove->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $soc_origin = $this->companytoremove;
+        $object = $this->company;
+        $user = DolibarrApiAccess::$user;
+
+
+        // Call same code than into action 'confirm_merge'
+
+
+        $db->begin();
+
+        // Recopy some data
+        $object->client = $object->client | $soc_origin->client;
+        $object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
+        $listofproperties=array(
+            'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
+            'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
+            'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
+            'stcomm_id', 'outstanding_limit', 'price_level', 'parent', 'default_lang', 'ref', 'ref_ext', 'import_key', 'fk_incoterms', 'fk_multicurrency',
+            'code_client', 'code_fournisseur', 'code_compta', 'code_compta_fournisseur',
+            'model_pdf', 'fk_projet'
+        );
+        foreach ($listofproperties as $property)
+        {
+            if (empty($object->$property)) $object->$property = $soc_origin->$property;
+        }
+
+        // Concat some data
+        $listofproperties=array(
+            'note_public', 'note_private'
+        );
+        foreach ($listofproperties as $property)
+        {
+            $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+        }
+
+        // Merge extrafields
+        if (is_array($soc_origin->array_options))
+        {
+            foreach ($soc_origin->array_options as $key => $val)
+            {
+                if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+            }
+        }
+
+        // Merge categories
+        $static_cat = new Categorie($db);
+        $custcats = $static_cat->containing($soc_origin->id, 'customer', 'id');
+        $object->setCategories($custcats, 'customer');
+        $suppcats = $static_cat->containing($soc_origin->id, 'supplier', 'id');
+        $object->setCategories($suppcats, 'supplier');
+
+        // If thirdparty has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
+        if ($soc_origin->code_client == $object->code_client
+            || $soc_origin->code_fournisseur == $object->code_fournisseur
+            || $soc_origin->barcode == $object->barcode)
+        {
+            dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
+            $soc_origin->code_client = '';
+            $soc_origin->code_fournisseur = '';
+            $soc_origin->barcode = '';
+            $soc_origin->update($soc_origin->id, $user, 0, 1, 1, 'merge');
+        }
+
+        // Update
+        $result = $object->update($object->id, $user, 0, 1, 1, 'merge');
+        if ($result < 0)
+        {
+            $error++;
+        }
+
+        // Move links
+        if (! $error)
+        {
+            $objects = array(
+                'Adherent' => '/adherents/class/adherent.class.php',
+                'Societe' => '/societe/class/societe.class.php',
+                'Categorie' => '/categories/class/categorie.class.php',
+                'ActionComm' => '/comm/action/class/actioncomm.class.php',
+                'Propal' => '/comm/propal/class/propal.class.php',
+                'Commande' => '/commande/class/commande.class.php',
+                'Facture' => '/compta/facture/class/facture.class.php',
+                'FactureRec' => '/compta/facture/class/facture-rec.class.php',
+                'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
+                'Contact' => '/contact/class/contact.class.php',
+                'Contrat' => '/contrat/class/contrat.class.php',
+                'Expedition' => '/expedition/class/expedition.class.php',
+                'Fichinter' => '/fichinter/class/fichinter.class.php',
+                'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
+                'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
+                'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
+                'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
+                'Livraison' => '/livraison/class/livraison.class.php',
+                'Product' => '/product/class/product.class.php',
+                'Project' => '/projet/class/project.class.php',
+                'User' => '/user/class/user.class.php',
+            );
+
+            //First, all core objects must update their tables
+            foreach ($objects as $object_name => $object_file)
+            {
+                require_once DOL_DOCUMENT_ROOT.$object_file;
+
+                if (!$errors && !$object_name::replaceThirdparty($db, $soc_origin->id, $object->id))
+                {
+                    $errors++;
+                    //setEventMessages($db->lasterror(), null, 'errors');
+                }
+            }
+        }
+
+        // External modules should update their ones too
+        if (!$errors)
+        {
+            $reshook = $hookmanager->executeHooks('replaceThirdparty', array(
+                'soc_origin' => $soc_origin->id,
+                'soc_dest' => $object->id
+            ), $soc_dest, $action);
+
+            if ($reshook < 0)
+            {
+                //setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+                $errors++;
+            }
+        }
+
+
+        if (! $error)
+        {
+            $object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+
+            // Call trigger
+            $result=$object->call_trigger('COMPANY_MODIFY',$user);
+            if ($result < 0)
+            {
+                //setEventMessages($object->error, $object->errors, 'errors');
+                $error++;
+            }
+            // End call triggers
+        }
+
+        if (! $error)
+        {
+            //We finally remove the old thirdparty
+            if ($soc_origin->delete($soc_origin->id, $user) < 1)
+            {
+                $errors++;
+            }
+        }
+
+        // End of merge
+
+        if ($error)
+        {
+            $db->rollback();
+
+            throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
+        }
+        else
+        {
+            $db->commit();
+        }
+
+        return $this->get($id);
+    }
+
+    /**
+     * Delete thirdparty
+     *
+     * @param int $id   Thirparty ID
+     * @return integer
+     */
+    function delete($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
-			throw new RestException(401);
-		}
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/*$result = $this->thirdparty->fetch($id);
+        if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
+            throw new RestException(401);
+        }
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        return $this->company->delete($id);
+    }
+
+    /**
+     * Get customer categories for a thirdparty
+     *
+     * @param int		$id         ID of thirdparty
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @param int		$page		Page number
+     *
+     * @return mixed
+     *
+     * @url GET {id}/categories
+     */
+    function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    {
+        if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result )
+        {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $categories = new Categorie($this->db);
+
+        $result = $categories->getListForItem($id, 'customer', $sortfield, $sortorder, $limit, $page);
+
+        if (is_numeric($result) && $result < 0)
+        {
+            throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+        }
+
+        if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+        {
+            return array();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Add a customer category to a thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int       $category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url POST {id}/categories/{category_id}
+     */
+    function addCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->add_type($this->company,'customer');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * Remove the link between a customer category and the thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int		$category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url DELETE {id}/categories/{category_id}
+     */
+    function deleteCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->del_type($this->company,'customer');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * Get supplier categories for a thirdparty
+     *
+     * @param int		$id         ID of thirdparty
+     * @param string	$sortfield	Sort field
+     * @param string	$sortorder	Sort order
+     * @param int		$limit		Limit for list
+     * @param int		$page		Page number
+     *
+     * @return mixed
+     *
+     * @url GET {id}/supplier_categories
+     */
+    function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+    {
+        if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result )
+        {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $categories = new Categorie($this->db);
+
+        $result = $categories->getListForItem($id, 'supplier', $sortfield, $sortorder, $limit, $page);
+
+        if (is_numeric($result) && $result < 0)
+        {
+            throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
+        }
+
+        if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+        {
+            return array();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Add a supplier category to a thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int       $category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url POST {id}/supplier_categories/{category_id}
+     */
+    function addSupplierCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->add_type($this->company,'supplier');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+    /**
+     * Remove the link between a category and the thirdparty
+     *
+     * @param int		$id				Id of thirdparty
+     * @param int		$category_id	Id of category
+     *
+     * @return mixed
+     *
+     * @url DELETE {id}/supplier_categories/{category_id}
+     */
+    function deleteSupplierCategory($id, $category_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+        $category = new Categorie($this->db);
+        $result = $category->fetch($category_id);
+        if( ! $result ) {
+            throw new RestException(404, 'category not found');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+        if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $category->del_type($this->company,'supplier');
+
+        return $this->_cleanObjectDatas($this->company);
+    }
+
+
+    /**
+     * Get outstanding proposals of thirdparty
+     *
+     * @param 	int 	$id			ID of the thirdparty
+     * @param 	string 	$mode		'customer' or 'supplier'
+     *
+     * @url     GET {id}/outstandingproposals
+     *
+     * @return array  				List of outstandings proposals of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    function getOutStandingProposals($id, $mode='customer')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $result = $this->company->getOutstandingProposals($mode);
+
+        unset($result['total_ht']);
+        unset($result['total_ttc']);
+
+        return $result;
+    }
+
+
+    /**
+     * Get outstanding orders of thirdparty
+     *
+     * @param 	int 	$id			ID of the thirdparty
+     * @param 	string 	$mode		'customer' or 'supplier'
+     *
+     * @url     GET {id}/outstandingorders
+     *
+     * @return array  				List of outstandings orders of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    function getOutStandingOrder($id, $mode='customer')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $result = $this->company->getOutstandingOrders($mode);
+
+        unset($result['total_ht']);
+        unset($result['total_ttc']);
+
+        return $result;
+    }
+
+    /**
+     * Get outstanding invoices of thirdparty
+     *
+     * @param 	int 	$id			ID of the thirdparty
+     * @param 	string 	$mode		'customer' or 'supplier'
+     *
+     * @url     GET {id}/outstandinginvoices
+     *
+     * @return array  				List of outstandings invoices of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     */
+    function getOutStandingInvoices($id, $mode='customer')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+        $result = $this->company->getOutstandingBills($mode);
+
+        unset($result['total_ht']);
+        unset($result['total_ttc']);
+
+        return $result;
+    }
+
+    /**
+     * Get fixed amount discount of a thirdparty (all sources: deposit, credit note, commercial offers...)
+     *
+     * @param 	int 	$id             ID of the thirdparty
+     * @param 	string 	$filter    	Filter exceptional discount. "none" will return every discount, "available" returns unapplied discounts, "used" returns applied discounts   {@choice none,available,used}
+     * @param   string  $sortfield  	Sort field
+     * @param   string  $sortorder  	Sort order
+     *
+     * @url     GET {id}/fixedamountdiscounts
+     *
+     * @return array  List of fixed discount of thirdparty
+     *
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 503
+     */
+    function getFixedAmountDiscounts($id, $filter="none", $sortfield = "f.type", $sortorder = 'ASC')
+    {
+        $obj_ret = array();
+
+        if(! DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        $result = $this->company->fetch($id);
+        if( ! $result ) {
+            throw new RestException(404, 'Thirdparty not found');
+        }
+
+
+        $sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
+        $sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
+        if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
+        if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+
+        $sql.= $this->db->order($sortfield, $sortorder);
+
+        $result = $this->db->query($sql);
+        if( ! $result ) {
+            throw new RestException(503, $this->db->lasterror());
+        } else {
+            $num = $this->db->num_rows($result);
+            while ( $obj = $this->db->fetch_object($result) ) {
+                $obj_ret[] = $obj;
+            }
+        }
+
+        return $obj_ret;
+    }
+
+
+
+    /**
+     * Return list of invoices qualified to be replaced by another invoice.
+     *
+     * @param int   $id             Id of thirdparty
+     *
+     * @url     GET {id}/getinvoicesqualifiedforreplacement
+     *
+     * @return array
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 405
+     */
+    function getInvoicesQualifiedForReplacement($id)
+    {
+        if(! DolibarrApiAccess::$user->rights->facture->lire) {
+            throw new RestException(401);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /*$result = $this->thirdparty->fetch($id);
 		 if( ! $result ) {
 		 throw new RestException(404, 'Thirdparty not found');
 		 }*/
 
-		$invoice = new Facture($this->db);
-		$result = $invoice->list_replacable_invoices($id);
-		if( $result < 0) {
-			throw new RestException(405, $this->thirdparty->error);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Return list of invoices qualified to be corrected by a credit note.
-	 * Invoices matching the following rules are returned
-	 * (validated + payment on process) or classified (payed completely or payed partialy) + not already replaced + not already a credit note
-	 *
-	 * @param int   $id             Id of thirdparty
-	 *
-	 * @url     GET {id}/getinvoicesqualifiedforcreditnote
-	 *
-	 * @return array
-	 * @throws 400
-	 * @throws 401
-	 * @throws 404
-	 * @throws 405
-	 */
-	function getInvoicesQualifiedForCreditNote($id)
+        $invoice = new Facture($this->db);
+        $result = $invoice->list_replacable_invoices($id);
+        if( $result < 0) {
+            throw new RestException(405, $this->thirdparty->error);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return list of invoices qualified to be corrected by a credit note.
+     * Invoices matching the following rules are returned
+     * (validated + payment on process) or classified (payed completely or payed partialy) + not already replaced + not already a credit note
+     *
+     * @param int   $id             Id of thirdparty
+     *
+     * @url     GET {id}/getinvoicesqualifiedforcreditnote
+     *
+     * @return array
+     * @throws 400
+     * @throws 401
+     * @throws 404
+     * @throws 405
+     */
+    function getInvoicesQualifiedForCreditNote($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
-			throw new RestException(401);
-		}
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/*$result = $this->thirdparty->fetch($id);
+        if(! DolibarrApiAccess::$user->rights->facture->lire) {
+            throw new RestException(401);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /*$result = $this->thirdparty->fetch($id);
 		 if( ! $result ) {
 		 throw new RestException(404, 'Thirdparty not found');
 		 }*/
 
-		$invoice = new Facture($this->db);
-		$result = $invoice->list_qualified_avoir_invoices($id);
-		if( $result < 0) {
-			throw new RestException(405, $this->thirdparty->error);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get CompanyBankAccount objects for thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 *
-	 * @return array
-	 *
-	 * @url GET {id}/bankaccounts
-	 */
-	function getCompanyBankAccount($id)
+        $invoice = new Facture($this->db);
+        $result = $invoice->list_qualified_avoir_invoices($id);
+        if( $result < 0) {
+            throw new RestException(405, $this->thirdparty->error);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get CompanyBankAccount objects for thirdparty
+     *
+     * @param int $id ID of thirdparty
+     *
+     * @return array
+     *
+     * @url GET {id}/bankaccounts
+     */
+    function getCompanyBankAccount($id)
+    {
+        global $db, $conf;
+
+        if(! DolibarrApiAccess::$user->rights->facture->lire) {
+            throw new RestException(401);
+        }
+        if(empty($id)) {
+            throw new RestException(400, 'Thirdparty ID is mandatory');
+        }
+
+        if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /**
+         * We select all the records that match the socid
+         */
+
+        $sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
+        $sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
+        if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+
+
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404, 'Account not found');
+        }
+
+        $i=0;
+
+        $accounts =[];
+
+        if ($result)
+        {
+            $num = $db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                $account = new CompanyBankAccount($db);
+                if($account->fetch($obj->rowid)) {
+                    $accounts[] = $account;
+                }
+                $i++;
+            }
+        }
+        else{
+            throw new RestException(404, 'Account not found');
+        }
+
+
+        $fields = ['socid', 'default_rib', 'frstrecur', '1000110000001', 'datec', 'datem', 'label', 'bank', 'bic', 'iban', 'id', 'rum'];
+
+        $returnAccounts = [];
+
+        foreach($accounts as $account){
+            $object= [];
+            foreach($account as $key => $value)
+                if(in_array($key, $fields)){
+                    $object[$key] = $value;
+                }
+            $returnAccounts[] = $object;
+        }
+
+        return $returnAccounts;
+    }
+
+    /**
+     * Create CompanyBankAccount object for thirdparty
+     * @param int  $id ID of thirdparty
+     * @param array $request_data Request data
+     *
+     * @return object  ID of thirdparty
+     *
+     * @url POST {id}/bankaccounts
+     */
+    function createCompanyBankAccount($id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $account = new CompanyBankAccount($this->db);
+
+        $account->socid = $id;
+
+        foreach($request_data as $field => $value) {
+            $account->$field = $value;
+        }
+
+        if ($account->create(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error creating Company Bank account');
+
+
+        if ($account->update(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error updating values');
+
+        return $account;
+    }
+
+    /**
+     * Update CompanyBankAccount object for thirdparty
+     *
+     * @param int $id ID of thirdparty
+     * @param int  $bankaccount_id ID of CompanyBankAccount
+     * @param array $request_data Request data
+     *
+     * @return object  ID of thirdparty
+     *
+     * @url PUT {id}/bankaccounts/{bankaccount_id}
+     */
+    function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $account = new CompanyBankAccount($this->db);
+
+        $account->fetch($bankaccount_id, $id, -1, '');
+
+        if($account->socid != $id){
+            throw new RestException(401);
+        }
+
+
+        foreach($request_data as $field => $value) {
+            $account->$field = $value;
+        }
+
+        if ($account->update(DolibarrApiAccess::$user) < 0)
+            throw new RestException(500, 'Error updating values');
+
+        return $account;
+    }
+
+    /**
+     * Delete a bank account attached to a thirdparty
+     *
+     * @param int $id ID of thirdparty
+     * @param int $bankaccount_id ID of CompanyBankAccount
+     *
+     * @return int -1 if error 1 if correct deletion
+     *
+     * @url DELETE {id}/bankaccounts/{bankaccount_id}
+     */
+    function deleteCompanyBankAccount($id, $bankaccount_id)
+    {
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $account = new CompanyBankAccount($this->db);
+
+        $account->fetch($bankaccount_id);
+
+        if(!$account->socid == $id)
+            throw new RestException(401);
+
+        return $account->delete(DolibarrApiAccess::$user);
+    }
+
+    /**
+     * Generate a Document from a bank account record (like SEPA mandate)
+     *
+     * @param int 		$id 			Thirdparty id
+     * @param int 		$companybankid 	Companybank id
+     * @param string 	$model 			Model of document to generate
+     * @return void
+     *
+     * @url GET {id}/generateBankAccountDocument/{companybankid}/{model}
+     */
+    public function generateBankAccountDocument($id, $companybankid = null, $model = 'sepamandate')
+    {
+        global $conf;
+
+        $this->langs->loadLangs(array("main","dict","commercial","products","companies","banks","bills","withdrawals"));
+
+        $this->company->fetch($id);
+
+        $action = 'builddoc';
+        if(! DolibarrApiAccess::$user->rights->societe->creer)
+            throw new RestException(401);
+
+        $this->company->setDocModel(DolibarrApiAccess::$user, $model);
+
+        $this->company->fk_bank = $this->company->fk_account;
+
+        $outputlangs = $this->langs;
+        $newlang='';
+
+        if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+        if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
+        if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
+        if (! empty($newlang)) {
+            $outputlangs = new Translate("",$conf);
+            $outputlangs->setDefaultLang($newlang);
+        }
+
+        // To be sure vars is defined
+        $hidedetails = $hidedesc = $hideref = 0;
+        $moreparams=null;
+        if (empty($hidedetails)) $hidedetails=0;
+        if (empty($hidedesc)) $hidedesc=0;
+        if (empty($hideref)) $hideref=0;
+        if (empty($moreparams)) $moreparams=null;
+
+
+        $sql = "SELECT rowid";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
+        if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+        if ($companybankid) $sql.= " AND id = ".$companybankid."";
+
+        $i=0;
+        $accounts=array();
+
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            if ($result->num_rows == 0) {
+                throw new RestException(404, 'Bank account not found');
+            }
+
+            $num = $this->db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+
+                $account = new CompanyBankAccount($this->db);
+                if ($account->fetch($obj->rowid)) {
+                    $accounts[] = $account;
+                }
+                $i++;
+            }
+        }
+        else
+        {
+            throw new RestException(404, 'Bank account not found');
+        }
+
+        $moreparams = array(
+            'use_companybankid'=>$accounts[0]->id,
+            'force_dir_output'=>$this->conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id)
+        );
+
+        $result = 0;
+
+        $result = $this->company->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+
+        if ($result > 0)
+        {
+            return array("success" => $result);
+        }
+        else
+        {
+            throw new RestException(500);
+        }
+    }
+
+    /**
+     * Get a specific gateway attached to a thirdparty (by specifying the site key)
+     *
+     * @param int $id ID of thirdparty
+     * @param string $site Site key
+     *
+     * @return SocieteAccount[]
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     *
+     * @url GET {id}/gateways/
+     */
+    function getSocieteAccounts($id, $site=null)
+    {
+        global $db, $conf;
+
+        if(!DolibarrApiAccess::$user->rights->societe->lire) {
+            throw new RestException(401);
+        }
+
+        if(!DolibarrApi::_checkAccessToResource('societe',$id)) {
+            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+        }
+
+        /**
+         * We select all the records that match the socid
+         */
+        $sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
+        $sql.= " WHERE fk_soc = $id";
+        if($site) $sql .= " AND site ='$site'";
+
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0){
+            throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
+        }
+
+        $i=0;
+
+        $accounts =[];
+
+        $num = $db->num_rows($result);
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($result);
+            $account = new SocieteAccount($db);
+
+            if($account->fetch($obj->rowid)) {
+                $accounts[] = $account;
+            }
+            $i++;
+        }
+
+        $fields = ['id', 'fk_soc', 'key_account', 'site', 'date_creation', 'tms'];
+
+        $returnAccounts = [];
+
+        foreach($accounts as $account){
+            $object= [];
+            foreach($account as $key => $value)
+                if(in_array($key, $fields)){
+                    $object[$key] = $value;
+                }
+            $returnAccounts[] = $object;
+        }
+
+        return $returnAccounts;
+    }
+
+    /**
+     * Create and attach a new gateway to an existing thirdparty
+     *
+     * Possible fields for request_data (request body) are specified in <code>llx_societe_account</code> table.<br>
+     * See <a href="https://wiki.dolibarr.org/index.php/Table_llx_societe_account">Table llx_societe_account</a> wiki page for more information<br><br>
+     * <u>Example body payload :</u> <pre>{"key_account": "cus_DAVkLSs1LYyYI", "site": "stripe"}</pre>
+     *
+     * @param int $id ID of thirdparty
+     * @param array $request_data Request data
+     *
+     * @return SocieteAccount
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 409 Conflict: A SocieteAccount entity (gateway) already exists for this company and site.
+     * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
+     * @throws 500 Internal Server Error: Error creating SocieteAccount account
+     * @status 201
+     *
+     * @url POST {id}/gateways
+     */
+    function createSocieteAccount($id, $request_data = null)
+    {
+        global $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        if(!isset($request_data['site'])) {
+            throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
+        }
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            $account = new SocieteAccount($this->db);
+            if(!isset($request_data['login'])) {
+                $account->login = "";
+            }
+            $account->fk_soc = $id;
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            if ($account->create(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
+
+            $this->_cleanObjectDatas($account);
+
+            return $account;
+        } else {
+            throw new RestException(409, 'A SocieteAccount entity already exists for this company and site.');
+        }
+    }
+
+    /**
+     * Create and attach a new (or replace an existing) specific site gateway to a thirdparty
+     *
+     * You <strong>MUST</strong> pass all values to keep (otherwise, they will be deleted) !<br>
+     * If you just need to update specific fields prefer <code>PATCH /thirdparties/{id}/gateways/{site}</code> endpoint.<br><br>
+     * When a <strong>SocieteAccount</strong> entity does not exist for the <code>id</code> and <code>site</code>
+     * supplied, a new one will be created. In that case <code>fk_soc</code> and <code>site</code> members form
+     * request body payload will be ignored and <code>id</code> and <code>site</code> query strings parameters
+     * will be used instead.
+     *
+     * @param int $id ID of thirdparty
+     * @param string $site Site key
+     * @param array $request_data Request data
+     *
+     * @return SocieteAccount
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
+     * @throws 500 Internal Server Error: Error updating SocieteAccount entity
+     *
+     * @throws RestException
+     * @url PUT {id}/gateways/{site}
+     */
+    function putSocieteAccount($id, $site, $request_data = null)
     {
-		global $db, $conf;
-
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
-			throw new RestException(401);
-		}
-		if(empty($id)) {
-			throw new RestException(400, 'Thirdparty ID is mandatory');
-		}
-
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/**
-		 * We select all the records that match the socid
-		 */
-
-		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-
-
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404, 'Account not found');
-		}
-
-		$i=0;
-
-		$accounts =[];
-
-		if ($result)
-		{
-			$num = $db->num_rows($result);
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-				$account = new CompanyBankAccount($db);
-				if($account->fetch($obj->rowid)) {
-					$accounts[] = $account;
-				}
-				$i++;
-			}
-		}
-		else{
-			throw new RestException(404, 'Account not found');
-		}
-
-
-		$fields = ['socid', 'default_rib', 'frstrecur', '1000110000001', 'datec', 'datem', 'label', 'bank', 'bic', 'iban', 'id', 'rum'];
-
-		$returnAccounts = [];
-
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
-					$object[$key] = $value;
-				}
-			$returnAccounts[] = $object;
-		}
-
-		return $returnAccounts;
-	}
-
-	/**
-	 * Create CompanyBankAccount object for thirdparty
-	 * @param int  $id ID of thirdparty
-	 * @param array $request_data Request data
-	 *
-	 * @return object  ID of thirdparty
-	 *
-	 * @url POST {id}/bankaccounts
-	 */
-	function createCompanyBankAccount($id, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$account = new CompanyBankAccount($this->db);
-
-		$account->socid = $id;
-
-		foreach($request_data as $field => $value) {
-			$account->$field = $value;
-		}
-
-		if ($account->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating Company Bank account');
-
-
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
-
-		return $account;
-	}
-
-	/**
-	 * Update CompanyBankAccount object for thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param int  $bankaccount_id ID of CompanyBankAccount
-	 * @param array $request_data Request data
-	 *
-	 * @return object  ID of thirdparty
-	 *
-	 * @url PUT {id}/bankaccounts/{bankaccount_id}
-	 */
-	function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
-	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$account = new CompanyBankAccount($this->db);
-
-		$account->fetch($bankaccount_id, $id, -1, '');
-
-		if($account->socid != $id){
-			throw new RestException(401);
-		}
-
-
-		foreach($request_data as $field => $value) {
-			$account->$field = $value;
-		}
-
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
-
-		return $account;
-	}
-
-	/**
-	 * Delete a bank account attached to a thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param int $bankaccount_id ID of CompanyBankAccount
-	 *
-	 * @return int -1 if error 1 if correct deletion
-	 *
-	 * @url DELETE {id}/bankaccounts/{bankaccount_id}
-	 */
-	function deleteCompanyBankAccount($id, $bankaccount_id)
+        global $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid, fk_user_creat, date_creation FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '$site' ";
+        $result = $db->query($sql);
+
+        // We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
+        if($result->num_rows == 0 ){
+            if(!isset($request_data['key_account'])) {
+                throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
+            }
+            $account = new SocieteAccount($this->db);
+            if(!isset($request_data['login'])) {
+                $account->login = "";
+            }
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            $account->fk_soc = $id;
+            $account->site = $site;
+
+            if ($account->create(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error creating SocieteAccount entity.');
+        // We found an existing SocieteAccount entity, we are replacing it
+        } else {
+
+            if(isset($request_data['site']) && $request_data['site'] !== $site) {
+                $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+                $result = $db->query($sql);
+
+                if($result->num_rows !== 0)
+                    throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+            }
+
+            $obj = $db->fetch_object($result);
+
+            $account = new SocieteAccount($this->db);
+            $account->id = $obj->rowid;
+            $account->fk_soc = $id;
+            $account->site = $site;
+            if(!isset($request_data['login'])) {
+                $account->login = "";
+            }
+            $account->fk_user_creat = $obj->fk_user_creat;
+            $account->date_creation = $obj->date_creation;
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            if ($account->update(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error updating SocieteAccount entity.');
+        }
+
+        $this->_cleanObjectDatas($account);
+
+        return $account;
+    }
+
+    /**
+     * Update specified values of a specific site gateway attached to a thirdparty
+     *
+     * @param int $id Id of thirdparty
+     * @param string  $site Site key
+     * @param array $request_data Request data
+     *
+     * @return SocieteAccount
+     * @throws 401 Unauthorized: User does not have permission to read thirdparties
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     * @throws 409 Conflict: Another SocieteAccount entity already exists for this thirdparty with this site key.
+     * @throws 500 Internal Server Error: Error updating SocieteAccount entity
+     *
+     * @url PATCH {id}/gateways/{site}
+     */
+    function patchSocieteAccount($id, $site, $request_data = null)
     {
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$account = new CompanyBankAccount($this->db);
-
-		$account->fetch($bankaccount_id);
-
-		if(!$account->socid == $id)
-			throw new RestException(401);
-
-		return $account->delete(DolibarrApiAccess::$user);
-	}
-
-	/**
-	 * Generate a Document from a bank account record (like SEPA mandate)
-	 *
-	 * @param int 		$id 			Thirdparty id
-	 * @param int 		$companybankid 	Companybank id
-	 * @param string 	$model 			Model of document to generate
-	 * @return void
-	 *
-	 * @url GET {id}/generateBankAccountDocument/{companybankid}/{model}
-	 */
-	public function generateBankAccountDocument($id, $companybankid = null, $model = 'sepamandate')
-	{
-		global $conf;
-
-		$this->langs->loadLangs(array("main","dict","commercial","products","companies","banks","bills","withdrawals"));
-
-		$this->company->fetch($id);
-
-		$action = 'builddoc';
-		if(! DolibarrApiAccess::$user->rights->societe->creer)
-			throw new RestException(401);
-
-		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
-
-		$this->company->fk_bank = $this->company->fk_account;
-
-		$outputlangs = $this->langs;
-		$newlang='';
-
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("",$conf);
-			$outputlangs->setDefaultLang($newlang);
-		}
-
-		// To be sure vars is defined
-		$hidedetails = $hidedesc = $hideref = 0;
-		$moreparams=null;
-		if (empty($hidedetails)) $hidedetails=0;
-		if (empty($hidedesc)) $hidedesc=0;
-		if (empty($hideref)) $hideref=0;
-		if (empty($moreparams)) $moreparams=null;
-
-
-		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql.= " AND id = ".$companybankid."";
-
-		$i=0;
-		$accounts=array();
-
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($result->num_rows == 0) {
-				throw new RestException(404, 'Bank account not found');
-			}
-
-			$num = $this->db->num_rows($result);
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-
-				$account = new CompanyBankAccount($this->db);
-				if ($account->fetch($obj->rowid)) {
-					$accounts[] = $account;
-				}
-				$i++;
-			}
-		}
-		else
-		{
-			throw new RestException(404, 'Bank account not found');
-		}
-
-		$moreparams = array(
-			'use_companybankid'=>$accounts[0]->id,
-			'force_dir_output'=>$this->conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id)
-		);
-
-		$result = 0;
-
-		$result = $this->company->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-
-		if ($result > 0)
-		{
-			return array("success" => $result);
-		}
-		else
-		{
-			throw new RestException(500);
-		}
+        global $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
+        } else {
+
+            // If the user tries to edit the site member, we check first if
+            if(isset($request_data['site']) && $request_data['site'] !== $site) {
+                $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+                $result = $db->query($sql);
+
+                if($result->num_rows !== 0)
+                    throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+            }
+
+            $obj = $db->fetch_object($result);
+            $account = new SocieteAccount($this->db);
+            $account->fetch($obj->rowid);
+
+            foreach($request_data as $field => $value) {
+                $account->$field = $value;
+            }
+
+            if ($account->update(DolibarrApiAccess::$user) < 0)
+                throw new RestException(500, 'Error updating SocieteAccount account');
+
+            $this->_cleanObjectDatas($account);
+
+            return $account;
+        }
     }
 
-  /**
-	 * Get a specific gateway attached to a thirdparty (by specifying the site key)
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param string $site Site key
-	 *
-	 * @return SocieteAccount[]
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 *
-	 * @url GET {id}/gateways/
-	 */
-	function getSocieteAccounts($id, $site=null)
+    /**
+     * Delete a specific site gateway attached to a thirdparty (by gateway id)
+     *
+     * @param int $id ID of thirdparty
+     * @param int $site Site key
+     *
+     * @return void
+     * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
+     *
+     * @url DELETE {id}/gateways/{site}
+     */
+    function deleteSocieteAccount($id, $site)
     {
-		global $db, $conf;
-
-		if(!DolibarrApiAccess::$user->rights->societe->lire) {
-			throw new RestException(401);
-		}
-
-		if(!DolibarrApi::_checkAccessToResource('societe',$id)) {
-			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-		}
-
-		/**
-		 * We select all the records that match the socid
-		 */
-		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
-		$sql.= " WHERE fk_soc = $id";
-		if($site) $sql .= " AND site ='$site'";
-
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0){
-			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
-		}
-
-		$i=0;
-
-		$accounts =[];
-
-		$num = $db->num_rows($result);
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($result);
-			$account = new SocieteAccount($db);
-
-			if($account->fetch($obj->rowid)) {
-				$accounts[] = $account;
-			}
-			$i++;
-		}
-
-		$fields = ['id', 'fk_soc', 'key_account', 'site', 'date_creation', 'tms'];
-
-		$returnAccounts = [];
-
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
-					$object[$key] = $value;
-				}
-			$returnAccounts[] = $object;
-		}
-
-		return $returnAccounts;
-	}
-
-	/**
-	 * Create and attach a new gateway to an existing thirdparty
-	 *
-	 * Possible fields for request_data (request body) are specified in <code>llx_societe_account</code> table.<br>
-	 * See <a href="https://wiki.dolibarr.org/index.php/Table_llx_societe_account">Table llx_societe_account</a> wiki page for more information<br><br>
-	 * <u>Example body payload :</u> <pre>{"key_account": "cus_DAVkLSs1LYyYI", "site": "stripe"}</pre>
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param array $request_data Request data
-	 *
-	 * @return SocieteAccount
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 409 Conflict: A SocieteAccount entity (gateway) already exists for this company and site.
-	 * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
-	 * @throws 500 Internal Server Error: Error creating SocieteAccount account
-	 * @status 201
-	 *
-	 * @url POST {id}/gateways
-	 */
-	function createSocieteAccount($id, $request_data = null)
-	{
-		global $db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		if(!isset($request_data['site'])) {
-			throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
-		}
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
-				$account->login = "";
-			}
-			$account->fk_soc = $id;
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
-
-			$this->_cleanObjectDatas($account);
-
-			return $account;
-		} else {
-			throw new RestException(409, 'A SocieteAccount entity already exists for this company and site.');
-		}
-	}
-
-	/**
-	 * Create and attach a new (or replace an existing) specific site gateway to a thirdparty
-	 *
-	 * You <strong>MUST</strong> pass all values to keep (otherwise, they will be deleted) !<br>
-	 * If you just need to update specific fields prefer <code>PATCH /thirdparties/{id}/gateways/{site}</code> endpoint.<br><br>
-	 * When a <strong>SocieteAccount</strong> entity does not exist for the <code>id</code> and <code>site</code>
-	 * supplied, a new one will be created. In that case <code>fk_soc</code> and <code>site</code> members form
-	 * request body payload will be ignored and <code>id</code> and <code>site</code> query strings parameters
-	 * will be used instead.
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param string $site Site key
-	 * @param array $request_data Request data
-	 *
-	 * @return SocieteAccount
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 422 Unprocessable Entity: You must pass the site attribute in your request data !
-	 * @throws 500 Internal Server Error: Error updating SocieteAccount entity
-	 *
-	 * @throws RestException
-	 * @url PUT {id}/gateways/{site}
-	 */
-	function putSocieteAccount($id, $site, $request_data = null)
-	{
-		global $db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$sql = "SELECT rowid, fk_user_creat, date_creation FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc = $id AND site = '$site' ";
-		$result = $db->query($sql);
-
-		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if($result->num_rows == 0 ){
-			if(!isset($request_data['key_account'])) {
-				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
-			}
-			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
-				$account->login = "";
-			}
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			$account->fk_soc = $id;
-			$account->site = $site;
-
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity.');
-		// We found an existing SocieteAccount entity, we are replacing it
-		} else {
-
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
-				$result = $db->query($sql);
-
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
-			}
-
-			$obj = $db->fetch_object($result);
-
-			$account = new SocieteAccount($this->db);
-			$account->id = $obj->rowid;
-			$account->fk_soc = $id;
-			$account->site = $site;
-			if(!isset($request_data['login'])) {
-				$account->login = "";
-			}
-			$account->fk_user_creat = $obj->fk_user_creat;
-			$account->date_creation = $obj->date_creation;
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount entity.');
-		}
-
-		$this->_cleanObjectDatas($account);
-
-		return $account;
-	}
-
-	/**
-	 * Update specified values of a specific site gateway attached to a thirdparty
-	 *
-	 * @param int $id Id of thirdparty
-	 * @param string  $site Site key
-	 * @param array $request_data Request data
-	 *
-	 * @return SocieteAccount
-	 * @throws 401 Unauthorized: User does not have permission to read thirdparties
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws 409 Conflict: Another SocieteAccount entity already exists for this thirdparty with this site key.
-	 * @throws 500 Internal Server Error: Error updating SocieteAccount entity
-	 *
-	 * @url PATCH {id}/gateways/{site}
-	 */
-	function patchSocieteAccount($id, $site, $request_data = null)
-	{
-		global $db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
-		} else {
-
-			// If the user tries to edit the site member, we check first if
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
-				$result = $db->query($sql);
-
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
-			}
-
-			$obj = $db->fetch_object($result);
-			$account = new SocieteAccount($this->db);
-			$account->fetch($obj->rowid);
-
-			foreach($request_data as $field => $value) {
-				$account->$field = $value;
-			}
-
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount account');
-
-			$this->_cleanObjectDatas($account);
-
-			return $account;
-		}
-	}
-
-	/**
-	 * Delete a specific site gateway attached to a thirdparty (by gateway id)
-	 *
-	 * @param int $id ID of thirdparty
-	 * @param int $site Site key
-	 *
-	 * @return void
-	 * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
-	 *
-	 * @url DELETE {id}/gateways/{site}
-	 */
-	function deleteSocieteAccount($id, $site)
+        global /** @var Database $db */
+        $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404);
+        } else {
+            $obj = $db->fetch_object($result);
+            $account = new SocieteAccount($this->db);
+            $account->fetch($obj->rowid);
+
+            if($account->delete(DolibarrApiAccess::$user) < 0) {
+                throw new RestException(500, "Error while deleting $site gateway attached to this third party");
+            }
+        }
+    }
+
+    /**
+     * Delete all gateways attached to a thirdparty
+     *
+     * @param int $id ID of thirdparty
+     *
+     * @return void
+     * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
+     * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
+     * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
+     *
+     * @url DELETE {id}/gateways
+     */
+    function deleteSocieteAccounts($id)
     {
-		global /** @var Database $db */
-		$db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404);
-		} else {
-			$obj = $db->fetch_object($result);
-			$account = new SocieteAccount($this->db);
-			$account->fetch($obj->rowid);
-
-			if($account->delete(DolibarrApiAccess::$user) < 0) {
-				throw new RestException(500, "Error while deleting $site gateway attached to this third party");
-			}
-		}
-	}
-
-	/**
-	 * Delete all gateways attached to a thirdparty
-	 *
-	 * @param int $id ID of thirdparty
-	 *
-	 * @return void
-	 * @throws 401 Unauthorized: User does not have permission to delete thirdparties gateways
-	 * @throws 404 Not Found: Specified thirdparty ID does not belongs to an existing thirdparty
-	 * @throws 500 Internal Server Error: Error deleting SocieteAccount entity
-	 *
-	 * @url DELETE {id}/gateways
-	 */
-	function deleteSocieteAccounts($id)
+        global /** @var Database $db */
+        $db;
+
+        if(! DolibarrApiAccess::$user->rights->societe->creer) {
+            throw new RestException(401);
+        }
+
+        /**
+         * We select all the records that match the socid
+         */
+
+        $sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
+        $sql.= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
+
+        $result = $db->query($sql);
+
+        if($result->num_rows == 0 ){
+            throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
+        } else {
+            $i=0;
+
+            $num = $db->num_rows($result);
+            while ($i < $num)
+            {
+                $obj = $db->fetch_object($result);
+                $account = new SocieteAccount($db);
+                $account->fetch($obj->rowid);
+
+                if($account->delete(DolibarrApiAccess::$user) < 0) {
+                    throw new RestException(500, 'Error while deleting gateways attached to this third party');
+                }
+                $i++;
+            }
+        }
+    }
+
+    /**
+     * Clean sensible object datas
+     *
+     * @param   object  $object    Object to clean
+     * @return    array    Array of cleaned object properties
+     */
+    function _cleanObjectDatas($object)
     {
-		global /** @var Database $db */
-		$db;
-
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
-			throw new RestException(401);
-		}
-
-		/**
-		 * We select all the records that match the socid
-		 */
-
-		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
-
-		$result = $db->query($sql);
-
-		if($result->num_rows == 0 ){
-			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
-		} else {
-			$i=0;
-
-			$num = $db->num_rows($result);
-			while ($i < $num)
-			{
-				$obj = $db->fetch_object($result);
-				$account = new SocieteAccount($db);
-				$account->fetch($obj->rowid);
-
-				if($account->delete(DolibarrApiAccess::$user) < 0) {
-					throw new RestException(500, 'Error while deleting gateways attached to this third party');
-				}
-				$i++;
-			}
-		}
-	}
-
-	/**
-	 * 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->nom);	// ->name already defined and nom deprecated
+
+        unset($object->total_ht);
+        unset($object->total_tva);
+        unset($object->total_localtax1);
+        unset($object->total_localtax2);
+        unset($object->total_ttc);
+
+        unset($object->lines);
+        unset($object->thirdparty);
+
+        return $object;
+    }
+
+    /**
+     * Validate fields before create or update object
+     *
+     * @param array $data   Datas to validate
+     * @return array
+     *
+     * @throws RestException
+     */
+    function _validate($data)
     {
-		$object = parent::_cleanObjectDatas($object);
-
-		unset($object->nom);	// ->name already defined and nom deprecated
-
-		unset($object->total_ht);
-		unset($object->total_tva);
-		unset($object->total_localtax1);
-		unset($object->total_localtax2);
-		unset($object->total_ttc);
-
-		unset($object->lines);
-		unset($object->thirdparty);
-
-		return $object;
-	}
-
-	/**
-	 * Validate fields before create or update object
-	 *
-	 * @param array $data   Datas to validate
-	 * @return array
-	 *
-	 * @throws RestException
-	 */
-	function _validate($data)
-	{
-		$thirdparty = array();
-		foreach (Thirdparties::$FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
-			$thirdparty[$field] = $data[$field];
-		}
-		return $thirdparty;
-	}
+        $thirdparty = array();
+        foreach (Thirdparties::$FIELDS as $field) {
+            if (!isset($data[$field]))
+                throw new RestException(400, "$field field missing");
+            $thirdparty[$field] = $data[$field];
+        }
+        return $thirdparty;
+    }
 }

Spacing +195 added lines, -195 removed lines

@@ -56,7 +56,7 @@ 
 
 		$this->company = new Societe($this->db);
 
-		if (! empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
+		if (!empty($conf->global->SOCIETE_EMAIL_MANDATORY)) {
 			static::$FIELDS[] = 'email';
 		}
 	}
@@ -73,20 +73,20 @@ 
 	 */
 	function get($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 			$filterabsolutediscount = "fk_facture_source IS NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 			$filtercreditnote = "fk_facture_source IS NOT NULL"; // If we want deposit to be substracted to payments only and not to total of final invoice
 		} else {
@@ -117,7 +117,7 @@ 
 	 * @param   string  $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.nom:like:'TheCompany%') and (t.date_creation:<:'20160101')"
 	 * @return  array               Array of thirdparty objects
 	 */
-	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode=0, $sqlfilters = '')
+	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $mode = 0, $sqlfilters = '')
     {
 		global $db, $conf;
 
@@ -128,23 +128,23 @@ 
 
 		// 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;
+		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."societe 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.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-		$sql.= " WHERE t.fk_stcomm = st.id";
-		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql.= " AND t.client IN (0)";
-		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe 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 .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
+		$sql .= " WHERE t.fk_stcomm = st.id";
+		if ($mode == 1) $sql .= " AND t.client IN (1, 3)";
+		if ($mode == 2) $sql .= " AND t.client IN (2, 3)";
+		if ($mode == 3) $sql .= " AND t.client IN (0)";
+		$sql .= ' AND t.entity IN ('.getEntity('societe').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc";
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		if ($socid) $sql .= " AND t.rowid 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)
 		{
@@ -153,15 +153,15 @@ 
 		// Add sql filters
 		if ($sqlfilters)
 		{
-			if (! DolibarrApi::_checkFilters($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).")";
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$sql.= $db->order($sortfield, $sortorder);
+		$sql .= $db->order($sortfield, $sortorder);
 
 		if ($limit) {
 			if ($page < 0)
@@ -170,7 +170,7 @@ 
 			}
 			$offset = $limit * $page;
 
-			$sql.= $db->plimit($limit + 1, $offset);
+			$sql .= $db->plimit($limit + 1, $offset);
 		}
 
 		$result = $db->query($sql);
@@ -182,7 +182,7 @@ 
 			{
 				$obj = $db->fetch_object($result);
 				$soc_static = new Societe($db);
-				if($soc_static->fetch($obj->rowid)) {
+				if ($soc_static->fetch($obj->rowid)) {
 					$obj_ret[] = $this->_cleanObjectDatas($soc_static);
 				}
 				$i++;
@@ -191,7 +191,7 @@ 
 		else {
 			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
 		}
-		if( ! count($obj_ret)) {
+		if (!count($obj_ret)) {
 			throw new RestException(404, 'Thirdparties not found');
 		}
 		return $obj_ret;
@@ -205,13 +205,13 @@ 
 	 */
 	function post($request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 		// Check mandatory fields
 		$result = $this->_validate($request_data);
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$this->company->$field = $value;
 		}
 		if ($this->company->create(DolibarrApiAccess::$user) < 0)
@@ -229,25 +229,25 @@ 
 	 */
 	function put($id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			if ($field == 'id') continue;
 			$this->company->$field = $value;
 		}
 
-		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
+		if ($this->company->update($id, DolibarrApiAccess::$user, 1, '', '', 'update'))
 			return $this->get($id);
 
 		return false;
@@ -278,27 +278,27 @@ 
 			throw new RestException(400, 'Try to merge a thirdparty into itself');
 		}
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-		$result = $this->company->fetch($id);	// include the fetch of extra fields
-		if( ! $result ) {
+		$result = $this->company->fetch($id); // include the fetch of extra fields
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$this->companytoremove = new Societe($db);
 
-		$result = $this->companytoremove->fetch($idtodelete);	// include the fetch of extra fields
-		if( ! $result ) {
+		$result = $this->companytoremove->fetch($idtodelete); // include the fetch of extra fields
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->companytoremove->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->companytoremove->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -315,7 +315,7 @@ 
 		// Recopy some data
 		$object->client = $object->client | $soc_origin->client;
 		$object->fournisseur = $object->fournisseur | $soc_origin->fournisseur;
-		$listofproperties=array(
+		$listofproperties = array(
 			'address', 'zip', 'town', 'state_id', 'country_id', 'phone', 'phone_pro', 'fax', 'email', 'skype', 'url', 'barcode',
 			'idprof1', 'idprof2', 'idprof3', 'idprof4', 'idprof5', 'idprof6',
 			'tva_intra', 'effectif_id', 'forme_juridique', 'remise_percent', 'remise_supplier_percent', 'mode_reglement_supplier_id', 'cond_reglement_supplier_id', 'name_bis',
@@ -329,7 +329,7 @@ 
 		}
 
 		// Concat some data
-		$listofproperties=array(
+		$listofproperties = array(
 			'note_public', 'note_private'
 		);
 		foreach ($listofproperties as $property)
@@ -373,7 +373,7 @@ 
 		}
 
 		// Move links
-		if (! $error)
+		if (!$error)
 		{
 			$objects = array(
 				'Adherent' => '/adherents/class/adherent.class.php',
@@ -428,12 +428,12 @@ 
 		}
 
 
-		if (! $error)
+		if (!$error)
 		{
-			$object->context=array('merge'=>1, 'mergefromid'=>$soc_origin->id);
+			$object->context = array('merge'=>1, 'mergefromid'=>$soc_origin->id);
 
 			// Call trigger
-			$result=$object->call_trigger('COMPANY_MODIFY',$user);
+			$result = $object->call_trigger('COMPANY_MODIFY', $user);
 			if ($result < 0)
 			{
 				//setEventMessages($object->error, $object->errors, 'errors');
@@ -442,7 +442,7 @@ 
 			// End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			//We finally remove the old thirdparty
 			if ($soc_origin->delete($soc_origin->id, $user) < 1)
@@ -475,14 +475,14 @@ 
 	 */
 	function delete($id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->supprimer) {
+		if (!DolibarrApiAccess::$user->rights->societe->supprimer) {
 			throw new RestException(401);
 		}
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		return $this->company->delete($id);
@@ -503,12 +503,12 @@ 
 	 */
 	function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result )
+		if (!$result)
 		{
 			throw new RestException(404, 'Thirdparty not found');
 		}
@@ -542,28 +542,28 @@ 
 	 */
 	function addCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->add_type($this->company,'customer');
+		$category->add_type($this->company, 'customer');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -580,28 +580,28 @@ 
 	 */
 	function deleteCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->del_type($this->company,'customer');
+		$category->del_type($this->company, 'customer');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -621,12 +621,12 @@ 
 	 */
 	function getSupplierCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
 	{
-		if (! DolibarrApiAccess::$user->rights->categorie->lire) {
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result )
+		if (!$result)
 		{
 			throw new RestException(404, 'Thirdparty not found');
 		}
@@ -660,28 +660,28 @@ 
 	 */
 	function addSupplierCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->add_type($this->company,'supplier');
+		$category->add_type($this->company, 'supplier');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -698,28 +698,28 @@ 
 	 */
 	function deleteSupplierCategory($id, $category_id)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 		$category = new Categorie($this->db);
 		$result = $category->fetch($category_id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'category not found');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$this->company->id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $this->company->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
-		if( ! DolibarrApi::_checkAccessToResource('category',$category->id)) {
+		if (!DolibarrApi::_checkAccessToResource('category', $category->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$category->del_type($this->company,'supplier');
+		$category->del_type($this->company, 'supplier');
 
 		return $this->_cleanObjectDatas($this->company);
 	}
@@ -739,24 +739,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingProposals($id, $mode='customer')
+	function getOutStandingProposals($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -783,24 +783,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingOrder($id, $mode='customer')
+	function getOutStandingOrder($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -826,24 +826,24 @@ 
 	 * @throws 401
 	 * @throws 404
 	 */
-	function getOutStandingInvoices($id, $mode='customer')
+	function getOutStandingInvoices($id, $mode = 'customer')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -872,24 +872,24 @@ 
 	 * @throws 404
 	 * @throws 503
 	 */
-	function getFixedAmountDiscounts($id, $filter="none", $sortfield = "f.type", $sortorder = 'ASC')
+	function getFixedAmountDiscounts($id, $filter = "none", $sortfield = "f.type", $sortorder = 'ASC')
 	{
 		$obj_ret = array();
 
-		if(! DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		$result = $this->company->fetch($id);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(404, 'Thirdparty not found');
 		}
 
@@ -900,14 +900,14 @@ 
 		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
 		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
 
-		$sql.= $this->db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$result = $this->db->query($sql);
-		if( ! $result ) {
+		if (!$result) {
 			throw new RestException(503, $this->db->lasterror());
 		} else {
 			$num = $this->db->num_rows($result);
-			while ( $obj = $this->db->fetch_object($result) ) {
+			while ($obj = $this->db->fetch_object($result)) {
 				$obj_ret[] = $obj;
 			}
 		}
@@ -932,14 +932,14 @@ 
 	 */
 	function getInvoicesQualifiedForReplacement($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -950,7 +950,7 @@ 
 
 		$invoice = new Facture($this->db);
 		$result = $invoice->list_replacable_invoices($id);
-		if( $result < 0) {
+		if ($result < 0) {
 			throw new RestException(405, $this->thirdparty->error);
 		}
 
@@ -974,14 +974,14 @@ 
 	 */
 	function getInvoicesQualifiedForCreditNote($id)
     {
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -992,7 +992,7 @@ 
 
 		$invoice = new Facture($this->db);
 		$result = $invoice->list_qualified_avoir_invoices($id);
-		if( $result < 0) {
+		if ($result < 0) {
 			throw new RestException(405, $this->thirdparty->error);
 		}
 
@@ -1012,14 +1012,14 @@ 
     {
 		global $db, $conf;
 
-		if(! DolibarrApiAccess::$user->rights->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
 			throw new RestException(401);
 		}
-		if(empty($id)) {
+		if (empty($id)) {
 			throw new RestException(400, 'Thirdparty ID is mandatory');
 		}
 
-		if( ! DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -1028,20 +1028,20 @@ 
 		 */
 
 		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
-		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+		$sql .= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
 
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'Account not found');
 		}
 
-		$i=0;
+		$i = 0;
 
-		$accounts =[];
+		$accounts = [];
 
 		if ($result)
 		{
@@ -1050,13 +1050,13 @@ 
 			{
 				$obj = $db->fetch_object($result);
 				$account = new CompanyBankAccount($db);
-				if($account->fetch($obj->rowid)) {
+				if ($account->fetch($obj->rowid)) {
 					$accounts[] = $account;
 				}
 				$i++;
 			}
 		}
-		else{
+		else {
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1065,10 +1065,10 @@ 
 
 		$returnAccounts = [];
 
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+		foreach ($accounts as $account) {
+			$object = [];
+			foreach ($account as $key => $value)
+				if (in_array($key, $fields)) {
 					$object[$key] = $value;
 				}
 			$returnAccounts[] = $object;
@@ -1088,7 +1088,7 @@ 
 	 */
 	function createCompanyBankAccount($id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1096,7 +1096,7 @@ 
 
 		$account->socid = $id;
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$account->$field = $value;
 		}
 
@@ -1123,7 +1123,7 @@ 
 	 */
 	function updateCompanyBankAccount($id, $bankaccount_id, $request_data = null)
 	{
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1131,12 +1131,12 @@ 
 
 		$account->fetch($bankaccount_id, $id, -1, '');
 
-		if($account->socid != $id){
+		if ($account->socid != $id) {
 			throw new RestException(401);
 		}
 
 
-		foreach($request_data as $field => $value) {
+		foreach ($request_data as $field => $value) {
 			$account->$field = $value;
 		}
 
@@ -1158,7 +1158,7 @@ 
 	 */
 	function deleteCompanyBankAccount($id, $bankaccount_id)
     {
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1166,7 +1166,7 @@ 
 
 		$account->fetch($bankaccount_id);
 
-		if(!$account->socid == $id)
+		if (!$account->socid == $id)
 			throw new RestException(401);
 
 		return $account->delete(DolibarrApiAccess::$user);
@@ -1186,12 +1186,12 @@ 
 	{
 		global $conf;
 
-		$this->langs->loadLangs(array("main","dict","commercial","products","companies","banks","bills","withdrawals"));
+		$this->langs->loadLangs(array("main", "dict", "commercial", "products", "companies", "banks", "bills", "withdrawals"));
 
 		$this->company->fetch($id);
 
 		$action = 'builddoc';
-		if(! DolibarrApiAccess::$user->rights->societe->creer)
+		if (!DolibarrApiAccess::$user->rights->societe->creer)
 			throw new RestException(401);
 
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
@@ -1199,32 +1199,32 @@ 
 		$this->company->fk_bank = $this->company->fk_account;
 
 		$outputlangs = $this->langs;
-		$newlang='';
+		$newlang = '';
 
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
-		if (! empty($newlang)) {
-			$outputlangs = new Translate("",$conf);
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang = $this->company->thirdparty->default_lang; // for proposal, order, invoice, ...
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang = $this->company->default_lang; // for thirdparty
+		if (!empty($newlang)) {
+			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
 
 		// To be sure vars is defined
 		$hidedetails = $hidedesc = $hideref = 0;
-		$moreparams=null;
-		if (empty($hidedetails)) $hidedetails=0;
-		if (empty($hidedesc)) $hidedesc=0;
-		if (empty($hideref)) $hideref=0;
-		if (empty($moreparams)) $moreparams=null;
+		$moreparams = null;
+		if (empty($hidedetails)) $hidedetails = 0;
+		if (empty($hidedesc)) $hidedesc = 0;
+		if (empty($hideref)) $hideref = 0;
+		if (empty($moreparams)) $moreparams = null;
 
 
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql.= " AND id = ".$companybankid."";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib";
+		if ($id) $sql .= " WHERE fk_soc  = ".$id." ";
+		if ($companybankid) $sql .= " AND id = ".$companybankid."";
 
-		$i=0;
-		$accounts=array();
+		$i = 0;
+		$accounts = array();
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -1281,15 +1281,15 @@ 
 	 *
 	 * @url GET {id}/gateways/
 	 */
-	function getSocieteAccounts($id, $site=null)
+	function getSocieteAccounts($id, $site = null)
     {
 		global $db, $conf;
 
-		if(!DolibarrApiAccess::$user->rights->societe->lire) {
+		if (!DolibarrApiAccess::$user->rights->societe->lire) {
 			throw new RestException(401);
 		}
 
-		if(!DolibarrApi::_checkAccessToResource('societe',$id)) {
+		if (!DolibarrApi::_checkAccessToResource('societe', $id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -1297,18 +1297,18 @@ 
 		 * We select all the records that match the socid
 		 */
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
-		$sql.= " WHERE fk_soc = $id";
-		if($site) $sql .= " AND site ='$site'";
+		$sql .= " WHERE fk_soc = $id";
+		if ($site) $sql .= " AND site ='$site'";
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This thirdparty does not have any gateway attached or does not exist.');
 		}
 
-		$i=0;
+		$i = 0;
 
-		$accounts =[];
+		$accounts = [];
 
 		$num = $db->num_rows($result);
 		while ($i < $num)
@@ -1316,7 +1316,7 @@ 
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($db);
 
-			if($account->fetch($obj->rowid)) {
+			if ($account->fetch($obj->rowid)) {
 				$accounts[] = $account;
 			}
 			$i++;
@@ -1326,10 +1326,10 @@ 
 
 		$returnAccounts = [];
 
-		foreach($accounts as $account){
-			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+		foreach ($accounts as $account) {
+			$object = [];
+			foreach ($account as $key => $value)
+				if (in_array($key, $fields)) {
 					$object[$key] = $value;
 				}
 			$returnAccounts[] = $object;
@@ -1361,25 +1361,25 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
-		if(!isset($request_data['site'])) {
+		if (!isset($request_data['site'])) {
 			throw new RestException(422, 'Unprocessable Entity: You must pass the site attribute in your request data !');
 		}
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 			$account->fk_soc = $id;
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1420,7 +1420,7 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1428,16 +1428,16 @@ 
 		$result = $db->query($sql);
 
 		// We do not found an existing SocieteAccount entity for this fk_soc and site ; we then create a new one.
-		if($result->num_rows == 0 ){
-			if(!isset($request_data['key_account'])) {
+		if ($result->num_rows == 0) {
+			if (!isset($request_data['key_account'])) {
 				throw new RestException(422, 'Unprocessable Entity: You must pass the key_account attribute in your request data !');
 			}
 			$account = new SocieteAccount($this->db);
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1449,12 +1449,12 @@ 
 		// We found an existing SocieteAccount entity, we are replacing it
 		} else {
 
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+			if (isset($request_data['site']) && $request_data['site'] !== $site) {
+				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+				if ($result->num_rows !== 0)
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site']." but another SocieteAccount entity already exists with this site key.");
 			}
 
 			$obj = $db->fetch_object($result);
@@ -1463,13 +1463,13 @@ 
 			$account->id = $obj->rowid;
 			$account->fk_soc = $id;
 			$account->site = $site;
-			if(!isset($request_data['login'])) {
+			if (!isset($request_data['login'])) {
 				$account->login = "";
 			}
 			$account->fk_user_creat = $obj->fk_user_creat;
 			$account->date_creation = $obj->date_creation;
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1501,31 +1501,31 @@ 
 	{
 		global $db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, "This thirdparty does not have $site gateway attached or does not exist.");
 		} else {
 
 			// If the user tries to edit the site member, we check first if
-			if(isset($request_data['site']) && $request_data['site'] !== $site) {
-				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
+			if (isset($request_data['site']) && $request_data['site'] !== $site) {
+				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '".$request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				if ($result->num_rows !== 0)
+					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site']." but another SocieteAccount entity already exists for this thirdparty with this site key.");
 			}
 
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
-			foreach($request_data as $field => $value) {
+			foreach ($request_data as $field => $value) {
 				$account->$field = $value;
 			}
 
@@ -1556,21 +1556,21 @@ 
 		global /** @var Database $db */
 		$db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id AND site = '$site' ";
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404);
 		} else {
 			$obj = $db->fetch_object($result);
 			$account = new SocieteAccount($this->db);
 			$account->fetch($obj->rowid);
 
-			if($account->delete(DolibarrApiAccess::$user) < 0) {
+			if ($account->delete(DolibarrApiAccess::$user) < 0) {
 				throw new RestException(500, "Error while deleting $site gateway attached to this third party");
 			}
 		}
@@ -1593,7 +1593,7 @@ 
 		global /** @var Database $db */
 		$db;
 
-		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+		if (!DolibarrApiAccess::$user->rights->societe->creer) {
 			throw new RestException(401);
 		}
 
@@ -1602,14 +1602,14 @@ 
 		 */
 
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms";
-		$sql.= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = $id ";
 
 		$result = $db->query($sql);
 
-		if($result->num_rows == 0 ){
+		if ($result->num_rows == 0) {
 			throw new RestException(404, 'This third party does not have any gateway attached or does not exist.');
 		} else {
-			$i=0;
+			$i = 0;
 
 			$num = $db->num_rows($result);
 			while ($i < $num)
@@ -1618,7 +1618,7 @@ 
 				$account = new SocieteAccount($db);
 				$account->fetch($obj->rowid);
 
-				if($account->delete(DolibarrApiAccess::$user) < 0) {
+				if ($account->delete(DolibarrApiAccess::$user) < 0) {
 					throw new RestException(500, 'Error while deleting gateways attached to this third party');
 				}
 				$i++;
@@ -1636,7 +1636,7 @@ 
     {
 		$object = parent::_cleanObjectDatas($object);
 
-		unset($object->nom);	// ->name already defined and nom deprecated
+		unset($object->nom); // ->name already defined and nom deprecated
 
 		unset($object->total_ht);
 		unset($object->total_tva);

Braces +139 added lines, -69 removed lines

@@ -128,23 +128,44 @@ 
 
 		// 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;
+		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)
+		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."societe 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
+		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.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
 		$sql.= " WHERE t.fk_stcomm = st.id";
-		if ($mode == 1) $sql.= " AND t.client IN (1, 3)";
-		if ($mode == 2) $sql.= " AND t.client IN (2, 3)";
-		if ($mode == 3) $sql.= " AND t.client IN (0)";
+		if ($mode == 1) {
+		    $sql.= " AND t.client IN (1, 3)";
+		}
+		if ($mode == 2) {
+		    $sql.= " AND t.client IN (2, 3)";
+		}
+		if ($mode == 3) {
+		    $sql.= " AND t.client IN (0)";
+		}
 		$sql.= ' AND t.entity IN ('.getEntity('societe').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+		    $sql.= " AND t.rowid = sc.fk_soc";
+		}
 		//if ($email != NULL) $sql.= " AND s.email = \"".$email."\"";
-		if ($socid) $sql.= " AND t.rowid IN (".$socids.")";
-		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		if ($socid) {
+		    $sql.= " AND t.rowid 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)
 		{
@@ -187,8 +208,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve thirdparties : '.$db->lasterror());
 		}
 		if( ! count($obj_ret)) {
@@ -214,8 +234,9 @@ 
 		foreach($request_data as $field => $value) {
 			$this->company->$field = $value;
 		}
-		if ($this->company->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+		if ($this->company->create(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error creating thirdparty', array_merge(array($this->company->error), $this->company->errors));
+		}
 
 		return $this->company->id;
 	}
@@ -243,12 +264,15 @@ 
 		}
 
 		foreach($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+			    continue;
+			}
 			$this->company->$field = $value;
 		}
 
-		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update'))
-			return $this->get($id);
+		if($this->company->update($id, DolibarrApiAccess::$user,1,'','','update')) {
+					return $this->get($id);
+		}
 
 		return false;
 	}
@@ -325,7 +349,9 @@ 
 		);
 		foreach ($listofproperties as $property)
 		{
-			if (empty($object->$property)) $object->$property = $soc_origin->$property;
+			if (empty($object->$property)) {
+			    $object->$property = $soc_origin->$property;
+			}
 		}
 
 		// Concat some data
@@ -342,7 +368,9 @@ 
 		{
 			foreach ($soc_origin->array_options as $key => $val)
 			{
-				if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+				if (empty($object->array_options[$key])) {
+				    $object->array_options[$key] = $val;
+				}
 			}
 		}
 
@@ -458,8 +486,7 @@ 
 			$db->rollback();
 
 			throw new RestException(500, 'Error failed to merged thirdparty '.$this->companytoremove->id.' into '.$id.'. Enable and read log file for more information.');
-		}
-		else
+		} else
 		{
 			$db->commit();
 		}
@@ -522,10 +549,12 @@ 
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
 
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+		if (is_numeric($result) && $result == 0) {
+		    // To fix a return of 0 instead of empty array of method getListForItem
 		{
 			return array();
 		}
+		}
 
 		return $result;
 	}
@@ -640,10 +669,12 @@ 
 			throw new RestException(503, 'Error when retrieve category list : '.$categories->error);
 		}
 
-		if (is_numeric($result) && $result == 0)	// To fix a return of 0 instead of empty array of method getListForItem
+		if (is_numeric($result) && $result == 0) {
+		    // To fix a return of 0 instead of empty array of method getListForItem
 		{
 			return array();
 		}
+		}
 
 		return $result;
 	}
@@ -897,8 +928,12 @@ 
 		$sql = "SELECT f.ref, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id;
-		if ($filter == "available")  $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
-		if ($filter == "used")  $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+		if ($filter == "available") {
+		    $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL";
+		}
+		if ($filter == "used") {
+		    $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)";
+		}
 
 		$sql.= $this->db->order($sortfield, $sortorder);
 
@@ -1030,7 +1065,9 @@ 
 		$sql = "SELECT rowid, fk_soc, bank, number, code_banque, code_guichet, cle_rib, bic, iban_prefix as iban, domiciliation, proprio,";
 		$sql.= " owner_address, default_rib, label, datec, tms as datem, rum, frstrecur";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
+		if ($id) {
+		    $sql.= " WHERE fk_soc  = ".$id." ";
+		}
 
 
 		$result = $db->query($sql);
@@ -1055,8 +1092,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else{
+		} else{
 			throw new RestException(404, 'Account not found');
 		}
 
@@ -1067,9 +1103,10 @@ 
 
 		foreach($accounts as $account){
 			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+			foreach($account as $key => $value) {
+							if(in_array($key, $fields)){
 					$object[$key] = $value;
+			}
 				}
 			$returnAccounts[] = $object;
 		}
@@ -1100,12 +1137,14 @@ 
 			$account->$field = $value;
 		}
 
-		if ($account->create(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error creating Company Bank account');
+		if ($account->create(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error creating Company Bank account');
+		}
 
 
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
+		if ($account->update(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error updating values');
+		}
 
 		return $account;
 	}
@@ -1140,8 +1179,9 @@ 
 			$account->$field = $value;
 		}
 
-		if ($account->update(DolibarrApiAccess::$user) < 0)
-			throw new RestException(500, 'Error updating values');
+		if ($account->update(DolibarrApiAccess::$user) < 0) {
+					throw new RestException(500, 'Error updating values');
+		}
 
 		return $account;
 	}
@@ -1166,8 +1206,9 @@ 
 
 		$account->fetch($bankaccount_id);
 
-		if(!$account->socid == $id)
-			throw new RestException(401);
+		if(!$account->socid == $id) {
+					throw new RestException(401);
+		}
 
 		return $account->delete(DolibarrApiAccess::$user);
 	}
@@ -1191,8 +1232,9 @@ 
 		$this->company->fetch($id);
 
 		$action = 'builddoc';
-		if(! DolibarrApiAccess::$user->rights->societe->creer)
-			throw new RestException(401);
+		if(! DolibarrApiAccess::$user->rights->societe->creer) {
+					throw new RestException(401);
+		}
 
 		$this->company->setDocModel(DolibarrApiAccess::$user, $model);
 
@@ -1201,9 +1243,17 @@ 
 		$outputlangs = $this->langs;
 		$newlang='';
 
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang;  // for proposal, order, invoice, ...
-		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang;                  // for thirdparty
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+		    $newlang=GETPOST('lang_id','aZ09');
+		}
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) {
+		    $newlang=$this->company->thirdparty->default_lang;
+		}
+		// for proposal, order, invoice, ...
+		if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) {
+		    $newlang=$this->company->default_lang;
+		}
+		// for thirdparty
 		if (! empty($newlang)) {
 			$outputlangs = new Translate("",$conf);
 			$outputlangs->setDefaultLang($newlang);
@@ -1212,16 +1262,28 @@ 
 		// To be sure vars is defined
 		$hidedetails = $hidedesc = $hideref = 0;
 		$moreparams=null;
-		if (empty($hidedetails)) $hidedetails=0;
-		if (empty($hidedesc)) $hidedesc=0;
-		if (empty($hideref)) $hideref=0;
-		if (empty($moreparams)) $moreparams=null;
+		if (empty($hidedetails)) {
+		    $hidedetails=0;
+		}
+		if (empty($hidedesc)) {
+		    $hidedesc=0;
+		}
+		if (empty($hideref)) {
+		    $hideref=0;
+		}
+		if (empty($moreparams)) {
+		    $moreparams=null;
+		}
 
 
 		$sql = "SELECT rowid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
-		if ($id) $sql.= " WHERE fk_soc  = ".$id." ";
-		if ($companybankid) $sql.= " AND id = ".$companybankid."";
+		if ($id) {
+		    $sql.= " WHERE fk_soc  = ".$id." ";
+		}
+		if ($companybankid) {
+		    $sql.= " AND id = ".$companybankid."";
+		}
 
 		$i=0;
 		$accounts=array();
@@ -1244,8 +1306,7 @@ 
 				}
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			throw new RestException(404, 'Bank account not found');
 		}
@@ -1262,8 +1323,7 @@ 
 		if ($result > 0)
 		{
 			return array("success" => $result);
-		}
-		else
+		} else
 		{
 			throw new RestException(500);
 		}
@@ -1298,7 +1358,9 @@ 
 		 */
 		$sql = "SELECT rowid, fk_soc, key_account, site, date_creation, tms FROM ".MAIN_DB_PREFIX."societe_account";
 		$sql.= " WHERE fk_soc = $id";
-		if($site) $sql .= " AND site ='$site'";
+		if($site) {
+		    $sql .= " AND site ='$site'";
+		}
 
 		$result = $db->query($sql);
 
@@ -1328,9 +1390,10 @@ 
 
 		foreach($accounts as $account){
 			$object= [];
-			foreach($account as $key => $value)
-				if(in_array($key, $fields)){
+			foreach($account as $key => $value) {
+							if(in_array($key, $fields)){
 					$object[$key] = $value;
+			}
 				}
 			$returnAccounts[] = $object;
 		}
@@ -1383,8 +1446,9 @@ 
 				$account->$field = $value;
 			}
 
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
+			if ($account->create(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error creating SocieteAccount entity. Ensure that the ID of thirdparty provided does exist!');
+			}
 
 			$this->_cleanObjectDatas($account);
 
@@ -1444,8 +1508,9 @@ 
 			$account->fk_soc = $id;
 			$account->site = $site;
 
-			if ($account->create(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error creating SocieteAccount entity.');
+			if ($account->create(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error creating SocieteAccount entity.');
+			}
 		// We found an existing SocieteAccount entity, we are replacing it
 		} else {
 
@@ -1453,8 +1518,9 @@ 
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+				if($result->num_rows !== 0) {
+									throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists with this site key.");
+				}
 			}
 
 			$obj = $db->fetch_object($result);
@@ -1473,8 +1539,9 @@ 
 				$account->$field = $value;
 			}
 
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount entity.');
+			if ($account->update(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error updating SocieteAccount entity.');
+			}
 		}
 
 		$this->_cleanObjectDatas($account);
@@ -1517,8 +1584,9 @@ 
 				$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_account WHERE fk_soc  = ".$id." AND site = '". $request_data['site']."' ";
 				$result = $db->query($sql);
 
-				if($result->num_rows !== 0)
-					throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				if($result->num_rows !== 0) {
+									throw new RestException(409, "You are trying to update this thirdparty SocieteAccount (gateway record) site member from $site to ".$request_data['site'] . " but another SocieteAccount entity already exists for this thirdparty with this site key.");
+				}
 			}
 
 			$obj = $db->fetch_object($result);
@@ -1529,8 +1597,9 @@ 
 				$account->$field = $value;
 			}
 
-			if ($account->update(DolibarrApiAccess::$user) < 0)
-				throw new RestException(500, 'Error updating SocieteAccount account');
+			if ($account->update(DolibarrApiAccess::$user) < 0) {
+							throw new RestException(500, 'Error updating SocieteAccount account');
+			}
 
 			$this->_cleanObjectDatas($account);
 
@@ -1662,8 +1731,9 @@ 
 	{
 		$thirdparty = array();
 		foreach (Thirdparties::$FIELDS as $field) {
-			if (!isset($data[$field]))
-				throw new RestException(400, "$field field missing");
+			if (!isset($data[$field])) {
+							throw new RestException(400, "$field field missing");
+			}
 			$thirdparty[$field] = $data[$field];
 		}
 		return $thirdparty;

dolibarr/htdocs/societe/societecontact.php

Indentation +220 added lines, -220 removed lines

@@ -54,60 +54,60 @@ 
 
 if ($action == 'addcontact' && $user->rights->societe->creer)
 {
-	$result = $object->fetch($id);
+    $result = $object->fetch($id);
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+        $contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+            $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
-		{
-			$mesg = '<div class="error">'.$object->error.'</div>';
-		}
-	}
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+        {
+            $langs->load("errors");
+            $mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
+        }
+        else
+        {
+            $mesg = '<div class="error">'.$object->error.'</div>';
+        }
+    }
 }
 
 // bascule du statut d'un contact
 else if ($action == 'swapstatut' && $user->rights->societe->creer)
 {
-	if ($object->fetch($id))
-	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    if ($object->fetch($id))
+    {
+        $result=$object->swapContactStatus(GETPOST('ligne'));
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 // Efface un contact
 else if ($action == 'deletecontact' && $user->rights->societe->creer)
 {
-	$object->fetch($id);
-	$result = $object->delete_contact($_GET["lineid"]);
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else {
-		dol_print_error($db);
-	}
+    $object->fetch($id);
+    $result = $object->delete_contact($_GET["lineid"]);
+
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else {
+        dol_print_error($db);
+    }
 }
 /*
 else if ($action == 'setaddress' && $user->rights->societe->creer)
@@ -141,28 +141,28 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	if ($object->fetch($id, $ref) > 0)
-	{
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
+    if ($object->fetch($id, $ref) > 0)
+    {
+        $soc = new Societe($db);
+        $soc->fetch($object->socid);
 
-		$head = societe_prepare_head($object);
-		dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
+        $head = societe_prepare_head($object);
+        dol_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
 
-		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
         dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
-    	print '<div class="fichecenter">';
+        print '<div class="fichecenter">';
 
         print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent">';
+        print '<table class="border centpercent">';
 
-    	// Prospect/Customer
-    	/*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
+        // Prospect/Customer
+        /*print '<tr><td class="titlefield">'.$langs->trans('ProspectCustomer').'</td><td>';
     	print $object->getLibCustProspStatut();
     	print '</td></tr>';
 
@@ -171,175 +171,175 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-		{
-		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-		}
-
-		if ($object->client)
-		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		    print $object->code_client;
-		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		    print '</td></tr>';
-		}
-
-		if ($object->fournisseur)
-		{
-		    print '<tr><td class="titlefield">';
-		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		    print $object->code_fournisseur;
-		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		    print '</td></tr>';
-		}
-		print '</table>';
-
-		print '</div>';
-
-		print '</form>';
-		print '<br>';
-
-		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
-		{
-			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
-		}
-
-		// additionnal list with adherents of company
-		if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
-		{
-			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
-
-			$membertypestatic=new AdherentType($db);
-			$memberstatic=new Adherent($db);
-
-			$langs->load("members");
-			$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
-			$sql.= " d.datefin,";
-			$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
-			$sql.= " t.libelle as type, t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
-			$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE d.fk_soc = ".$id;
-			$sql.= " AND d.fk_adherent_type = t.rowid";
-
-			dol_syslog("get list sql=".$sql);
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$num = $db->num_rows($resql);
-
-				if ($num  > 0 )
-				{
-					$titre=$langs->trans("MembersListOfTiers");
-					print '<br>';
-
-					print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
-
-					print "<table class=\"noborder\" width=\"100%\">";
-					print '<tr class="liste_titre">';
-					print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
-					print "</tr>\n";
-
-					$i=0;
-					while ($i < $num && $i < $conf->liste_limit)
-					{
-						$objp = $db->fetch_object($resql);
-
-						$datefin=$db->jdate($objp->datefin);
-						$memberstatic->id=$objp->rowid;
-						$memberstatic->ref=$objp->rowid;
-						$memberstatic->lastname=$objp->lastname;
-						$memberstatic->firstname=$objp->firstname;
-						$memberstatic->statut=$objp->statut;
-						$memberstatic->datefin=$db->jdate($objp->datefin);
-
-						$companyname=$objp->company;
-
-						print '<tr class="oddeven">';
-
-						// Ref
-						print "<td>";
-						print $memberstatic->getNomUrl(1);
-						print "</td>\n";
-
-						// Lastname
-						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
-						print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
-						print "</a></td>\n";
-
-						// Login
-						print "<td>".$objp->login."</td>\n";
-
-						// Type
-						$membertypestatic->id=$objp->type_id;
-						$membertypestatic->libelle=$objp->type;
-						print '<td class="nowrap">';
-						print $membertypestatic->getNomUrl(1,32);
-						print '</td>';
-
-						// Moral/Physique
-						print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
-
-						// EMail
-						print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
-
-						// Statut
-						print '<td class="nowrap">';
-						print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
-						print "</td>";
-
-						// End of subscription date
-						if ($datefin)
-						{
-							print '<td align="center" class="nowrap">';
-							print dol_print_date($datefin,'day');
-							if ($memberstatic->hasDelay()) {
-								print " ".img_warning($langs->trans("SubscriptionLate"));
-							}
-							print '</td>';
-						}
-						else
-						{
-							print '<td align="left" class="nowrap">';
-							if ($objp->subscription == 'yes')
-							{
-								print $langs->trans("SubscriptionNotReceived");
-								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else
-							{
-								print '&nbsp;';
-							}
-							print '</td>';
-						}
-
-						print "</tr>\n";
-						$i++;
-					}
-					print "</table>\n";
-				}
-			}
-		}
-	}
-	else
-	{
-		// Contrat non trouve
-		print "ErrorRecordNotFound";
-	}
+        if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+        {
+            print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+        }
+
+        if ($object->client)
+        {
+            print '<tr><td class="titlefield">';
+            print $langs->trans('CustomerCode').'</td><td colspan="3">';
+            print $object->code_client;
+            if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+            print '</td></tr>';
+        }
+
+        if ($object->fournisseur)
+        {
+            print '<tr><td class="titlefield">';
+            print $langs->trans('SupplierCode').'</td><td colspan="3">';
+            print $object->code_fournisseur;
+            if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+            print '</td></tr>';
+        }
+        print '</table>';
+
+        print '</div>';
+
+        print '</form>';
+        print '<br>';
+
+        // Contacts lines (modules that overwrite templates must declare this into descriptor)
+        $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+        foreach($dirtpls as $reldir)
+        {
+            $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+            if ($res) break;
+        }
+
+        // additionnal list with adherents of company
+        if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+        {
+            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+
+            $membertypestatic=new AdherentType($db);
+            $memberstatic=new Adherent($db);
+
+            $langs->load("members");
+            $sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
+            $sql.= " d.datefin,";
+            $sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+            $sql.= " t.libelle as type, t.subscription";
+            $sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
+            $sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
+            $sql.= " WHERE d.fk_soc = ".$id;
+            $sql.= " AND d.fk_adherent_type = t.rowid";
+
+            dol_syslog("get list sql=".$sql);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $num = $db->num_rows($resql);
+
+                if ($num  > 0 )
+                {
+                    $titre=$langs->trans("MembersListOfTiers");
+                    print '<br>';
+
+                    print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+
+                    print "<table class=\"noborder\" width=\"100%\">";
+                    print '<tr class="liste_titre">';
+                    print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
+                    print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+                    print "</tr>\n";
+
+                    $i=0;
+                    while ($i < $num && $i < $conf->liste_limit)
+                    {
+                        $objp = $db->fetch_object($resql);
+
+                        $datefin=$db->jdate($objp->datefin);
+                        $memberstatic->id=$objp->rowid;
+                        $memberstatic->ref=$objp->rowid;
+                        $memberstatic->lastname=$objp->lastname;
+                        $memberstatic->firstname=$objp->firstname;
+                        $memberstatic->statut=$objp->statut;
+                        $memberstatic->datefin=$db->jdate($objp->datefin);
+
+                        $companyname=$objp->company;
+
+                        print '<tr class="oddeven">';
+
+                        // Ref
+                        print "<td>";
+                        print $memberstatic->getNomUrl(1);
+                        print "</td>\n";
+
+                        // Lastname
+                        print "<td><a href=\"card.php?rowid=$objp->rowid\">";
+                        print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+                        print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
+                        print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+                        print "</a></td>\n";
+
+                        // Login
+                        print "<td>".$objp->login."</td>\n";
+
+                        // Type
+                        $membertypestatic->id=$objp->type_id;
+                        $membertypestatic->libelle=$objp->type;
+                        print '<td class="nowrap">';
+                        print $membertypestatic->getNomUrl(1,32);
+                        print '</td>';
+
+                        // Moral/Physique
+                        print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
+
+                        // EMail
+                        print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+
+                        // Statut
+                        print '<td class="nowrap">';
+                        print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
+                        print "</td>";
+
+                        // End of subscription date
+                        if ($datefin)
+                        {
+                            print '<td align="center" class="nowrap">';
+                            print dol_print_date($datefin,'day');
+                            if ($memberstatic->hasDelay()) {
+                                print " ".img_warning($langs->trans("SubscriptionLate"));
+                            }
+                            print '</td>';
+                        }
+                        else
+                        {
+                            print '<td align="left" class="nowrap">';
+                            if ($objp->subscription == 'yes')
+                            {
+                                print $langs->trans("SubscriptionNotReceived");
+                                if ($objp->statut > 0) print " ".img_warning();
+                            }
+                            else
+                            {
+                                print '&nbsp;';
+                            }
+                            print '</td>';
+                        }
+
+                        print "</tr>\n";
+                        $i++;
+                    }
+                    print "</table>\n";
+                }
+            }
+        }
+    }
+    else
+    {
+        // Contrat non trouve
+        print "ErrorRecordNotFound";
+    }
 }
 
 // End of page

Braces +25 added lines, -20 removed lines

@@ -39,7 +39,9 @@ 
 $action=GETPOST('action','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $id,'');
 
 $object = new Societe($db);
@@ -66,15 +68,13 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			$mesg = '<div class="error">'.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'</div>';
-		}
-		else
+		} else
 		{
 			$mesg = '<div class="error">'.$object->error.'</div>';
 		}
@@ -87,8 +87,7 @@ 
 	if ($object->fetch($id))
 	{
 	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -104,8 +103,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 }
@@ -171,17 +169,21 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+		    // Old not used prefix field
 		{
 		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
+		}
 
 		if ($object->client)
 		{
 		    print '<tr><td class="titlefield">';
 		    print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		    print $object->code_client;
-		    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		    if ($object->check_codeclient() <> 0) {
+		        print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		    }
 		    print '</td></tr>';
 		}
 
@@ -190,7 +192,9 @@ 
 		    print '<tr><td class="titlefield">';
 		    print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		    print $object->code_fournisseur;
-		    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		    if ($object->check_codefournisseur() <> 0) {
+		        print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		    }
 		    print '</td></tr>';
 		}
 		print '</table>';
@@ -205,7 +209,9 @@ 
 		foreach($dirtpls as $reldir)
 		{
 			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
+			if ($res) {
+			    break;
+			}
 		}
 
 		// additionnal list with adherents of company
@@ -311,16 +317,16 @@ 
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}
 							print '</td>';
-						}
-						else
+						} else
 						{
 							print '<td align="left" class="nowrap">';
 							if ($objp->subscription == 'yes')
 							{
 								print $langs->trans("SubscriptionNotReceived");
-								if ($objp->statut > 0) print " ".img_warning();
-							}
-							else
+								if ($objp->statut > 0) {
+								    print " ".img_warning();
+								}
+							} else
 							{
 								print '&nbsp;';
 							}
@@ -334,8 +340,7 @@ 
 				}
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Contrat non trouve
 		print "ErrorRecordNotFound";

Spacing +58 added lines, -58 removed lines

@@ -29,7 +29,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -38,18 +38,18 @@ 
 
 $langs->loadLangs(array("orders", "companies"));
 
-$id=GETPOST('id','int')?GETPOST('id','int'):GETPOST('socid','int');
-$ref=GETPOST('ref','alpha');
-$action=GETPOST('action','alpha');
+$id = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe', $id,'');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', $id, '');
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('contactthirdparty','globalcard'));
+$hookmanager->initHooks(array('contactthirdparty', 'globalcard'));
 
 
 /*
@@ -62,7 +62,7 @@ 
 
     if ($result > 0 && $id > 0)
     {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
@@ -90,7 +90,7 @@ 
 {
 	if ($object->fetch($id))
 	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
+	    $result = $object->swapContactStatus(GETPOST('ligne'));
 	}
 	else
 	{
@@ -126,15 +126,15 @@ 
  * View
  */
 
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$langs->trans("ThirdParty"),$help_url);
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $langs->trans("ThirdParty"), $help_url);
 
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
-$contactstatic=new Contact($db);
-$userstatic=new User($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
 
 
 /* *************************************************************************** */
@@ -143,7 +143,7 @@ 
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	if ($object->fetch($id, $ref) > 0)
 	{
@@ -158,7 +158,7 @@ 
 
         $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+        dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     	print '<div class="fichecenter">';
 
@@ -175,7 +175,7 @@ 
     	print yn($object->fournisseur);
     	print '</td></tr>';*/
 
-		if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+		if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 		{
 		    print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 		}
@@ -205,31 +205,31 @@ 
 		print '<br>';
 
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
-		$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-		foreach($dirtpls as $reldir)
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+		foreach ($dirtpls as $reldir)
 		{
-			$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
 			if ($res) break;
 		}
 
 		// additionnal list with adherents of company
-		if (! empty($conf->adherent->enabled) && $user->rights->adherent->lire)
+		if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 
-			$membertypestatic=new AdherentType($db);
-			$memberstatic=new Adherent($db);
+			$membertypestatic = new AdherentType($db);
+			$memberstatic = new Adherent($db);
 
 			$langs->load("members");
 			$sql = "SELECT d.rowid, d.login, d.lastname, d.firstname, d.societe as company, d.fk_soc,";
-			$sql.= " d.datefin,";
-			$sql.= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
-			$sql.= " t.libelle as type, t.subscription";
-			$sql.= " FROM ".MAIN_DB_PREFIX."adherent as d";
-			$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql.= " WHERE d.fk_soc = ".$id;
-			$sql.= " AND d.fk_adherent_type = t.rowid";
+			$sql .= " d.datefin,";
+			$sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";
+			$sql .= " t.libelle as type, t.subscription";
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
+			$sql .= ", ".MAIN_DB_PREFIX."adherent_type as t";
+			$sql .= " WHERE d.fk_soc = ".$id;
+			$sql .= " AND d.fk_adherent_type = t.rowid";
 
 			dol_syslog("get list sql=".$sql);
 			$resql = $db->query($sql);
@@ -237,39 +237,39 @@ 
 			{
 				$num = $db->num_rows($resql);
 
-				if ($num  > 0 )
+				if ($num > 0)
 				{
-					$titre=$langs->trans("MembersListOfTiers");
+					$titre = $langs->trans("MembersListOfTiers");
 					print '<br>';
 
-					print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords,'');
+					print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
 					print "<table class=\"noborder\" width=\"100%\">";
 					print '<tr class="liste_titre">';
-					print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre( $langs->trans("Name")." / ".$langs->trans("Company"),$_SERVER["PHP_SELF"],"d.lastname",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Login",$_SERVER["PHP_SELF"],"d.login",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"t.libelle",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Person",$_SERVER["PHP_SELF"],"d.morphy",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EMail",$_SERVER["PHP_SELF"],"d.email",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.statut,d.datefin",$param,"","",$sortfield,$sortorder);
-					print_liste_field_titre("EndSubscription",$_SERVER["PHP_SELF"],"d.datefin",$param,"",'align="center"',$sortfield,$sortorder);
+					print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "d.rowid", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "t.libelle", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Person", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "d.statut,d.datefin", $param, "", "", $sortfield, $sortorder);
+					print_liste_field_titre("EndSubscription", $_SERVER["PHP_SELF"], "d.datefin", $param, "", 'align="center"', $sortfield, $sortorder);
 					print "</tr>\n";
 
-					$i=0;
+					$i = 0;
 					while ($i < $num && $i < $conf->liste_limit)
 					{
 						$objp = $db->fetch_object($resql);
 
-						$datefin=$db->jdate($objp->datefin);
-						$memberstatic->id=$objp->rowid;
-						$memberstatic->ref=$objp->rowid;
-						$memberstatic->lastname=$objp->lastname;
-						$memberstatic->firstname=$objp->firstname;
-						$memberstatic->statut=$objp->statut;
-						$memberstatic->datefin=$db->jdate($objp->datefin);
+						$datefin = $db->jdate($objp->datefin);
+						$memberstatic->id = $objp->rowid;
+						$memberstatic->ref = $objp->rowid;
+						$memberstatic->lastname = $objp->lastname;
+						$memberstatic->firstname = $objp->firstname;
+						$memberstatic->statut = $objp->statut;
+						$memberstatic->datefin = $db->jdate($objp->datefin);
 
-						$companyname=$objp->company;
+						$companyname = $objp->company;
 
 						print '<tr class="oddeven">';
 
@@ -280,37 +280,37 @@ 
 
 						// Lastname
 						print "<td><a href=\"card.php?rowid=$objp->rowid\">";
-						print ((! empty($objp->lastname) || ! empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
-						print (((! empty($objp->lastname) || ! empty($objp->firstname)) && ! empty($companyname)) ? ' / ' : '');
-						print (! empty($companyname) ? dol_trunc($companyname, 32) : '');
+						print ((!empty($objp->lastname) || !empty($objp->firstname)) ? dol_trunc($memberstatic->getFullName($langs)) : '');
+						print (((!empty($objp->lastname) || !empty($objp->firstname)) && !empty($companyname)) ? ' / ' : '');
+						print (!empty($companyname) ? dol_trunc($companyname, 32) : '');
 						print "</a></td>\n";
 
 						// Login
 						print "<td>".$objp->login."</td>\n";
 
 						// Type
-						$membertypestatic->id=$objp->type_id;
-						$membertypestatic->libelle=$objp->type;
+						$membertypestatic->id = $objp->type_id;
+						$membertypestatic->libelle = $objp->type;
 						print '<td class="nowrap">';
-						print $membertypestatic->getNomUrl(1,32);
+						print $membertypestatic->getNomUrl(1, 32);
 						print '</td>';
 
 						// Moral/Physique
 						print "<td>".$memberstatic->getmorphylib($objp->morphy)."</td>\n";
 
 						// EMail
-						print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n";
+						print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";
 
 						// Statut
 						print '<td class="nowrap">';
-						print $memberstatic->LibStatut($objp->statut,$objp->subscription,$datefin,2);
+						print $memberstatic->LibStatut($objp->statut, $objp->subscription, $datefin, 2);
 						print "</td>";
 
 						// End of subscription date
 						if ($datefin)
 						{
 							print '<td align="center" class="nowrap">';
-							print dol_print_date($datefin,'day');
+							print dol_print_date($datefin, 'day');
 							if ($memberstatic->hasDelay()) {
 								print " ".img_warning($langs->trans("SubscriptionLate"));
 							}

dolibarr/htdocs/societe/project.php

Indentation +34 added lines, -34 removed lines

@@ -62,23 +62,23 @@ 
 
 if ($socid)
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-	$langs->load("companies");
+    $langs->load("companies");
 
 
-	$object = new Societe($db);
-	$result = $object->fetch($socid);
+    $object = new Societe($db);
+    $result = $object->fetch($socid);
 
-	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+    $title=$langs->trans("Projects");
+    if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+    llxHeader('',$title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = societe_prepare_head($object);
+    if (! empty($conf->notification->enabled)) $langs->load("mails");
+    $head = societe_prepare_head($object);
 
-	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
+    dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -87,36 +87,36 @@ 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
+    print '<table class="border centpercent">';
 
     if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
 
-	if ($object->client)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		print '</td></tr>';
-	}
+    if ($object->client)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('CustomerCode').'</td><td colspan="3">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td></tr>';
+    }
 
-	if ($object->fournisseur)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		print '</td></tr>';
-	}
+    if ($object->fournisseur)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('SupplierCode').'</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td></tr>';
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '</div>';
+    print '</div>';
 
-	dol_fiche_end();
+    dol_fiche_end();
 
 
     /*
@@ -129,7 +129,7 @@ 
     {
     	if (! empty($conf->projet->enabled) && ! empty($user->rights->projet->creer))
     	{*/
-        	$addbutton = '<a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
+            $addbutton = '<a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&socid='.$object->id.'&amp;backtopage='.urlencode($backtopage).'">'.$langs->trans("AddProject").'</a>';
     /*	}
     	else
     	{
@@ -142,8 +142,8 @@ 
     print '<br>';
 
 
-	// Projects list
-	$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
+    // Projects list
+    $result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
 }
 
 // End of page

Braces +21 added lines, -7 removed lines

@@ -35,7 +35,9 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -48,7 +50,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 
@@ -72,10 +76,14 @@ 
 	$result = $object->fetch($socid);
 
 	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+	    $title=$object->name." - ".$title;
+	}
 	llxHeader('',$title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (! empty($conf->notification->enabled)) {
+	    $langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
@@ -89,17 +97,21 @@ 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+        // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
+    }
 
 	if ($object->client)
 	{
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		if ($object->check_codeclient() <> 0) {
+		    print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
@@ -108,7 +120,9 @@ 
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		if ($object->check_codefournisseur() <> 0) {
+		    print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -38,8 +38,8 @@ 
 $langs->loadLangs(array("companies", "projects"));
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -50,8 +50,8 @@ 
  *	Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
@@ -75,25 +75,25 @@ 
 	$object = new Societe($db);
 	$result = $object->fetch($socid);
 
-	$title=$langs->trans("Projects");
-	if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-	llxHeader('',$title);
+	$title = $langs->trans("Projects");
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+	llxHeader('', $title);
 
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
 	dol_fiche_head($head, 'project', $langs->trans("ThirdParty"), -1, 'company');
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent">';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -147,7 +147,7 @@ 
 
 
 	// Projects list
-	$result=show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
+	$result = show_projects($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1, $addbutton);
 }
 
 // End of page

dolibarr/htdocs/societe/notify/card.php

Indentation +16 added lines, -16 removed lines

@@ -78,12 +78,12 @@ 
     {
         if (empty($contactid))
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
             $error++;
         }
         if ($actionid <= 0)
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
             $error++;
         }
 
@@ -212,7 +212,7 @@ 
     print '<br>'.$langs->trans("NotificationsDescUser");
     print '<br>'.$langs->trans("NotificationsDescContact");
     print '<br>'.$langs->trans("NotificationsDescGlobal");
-	print '</div>';
+    print '</div>';
 
     print '<br><br>'."\n";
 
@@ -233,7 +233,7 @@ 
     print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
     print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
     print_liste_field_titre('');
-	print "</tr>\n";
+    print "</tr>\n";
 
     $var=false;
     $listofemails=$object->thirdparty_and_contact_email_array();
@@ -247,7 +247,7 @@ 
 
         foreach($listofmanagedeventfornotification as $managedeventfornotification)
         {
- 			$label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
+                $label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
             $actions[$managedeventfornotification['rowid']]=$label;
         }
         print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
@@ -310,8 +310,8 @@ 
     print_liste_field_titre('','','');
     print '</tr>';
 
-	$langs->load("errors");
-	$langs->load("other");
+    $langs->load("errors");
+    $langs->load("other");
 
     if ($num)
     {
@@ -431,8 +431,8 @@ 
         $nbtotalofrecords = $db->num_rows($result);
         if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
         {
-        	$page = 0;
-        	$offset = 0;
+            $page = 0;
+            $offset = 0;
         }
     }
 
@@ -487,15 +487,15 @@ 
             print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
-	            $contactstatic->id=$obj->id;
-	            $contactstatic->lastname=$obj->lastname;
-	            $contactstatic->firstname=$obj->firstname;
-	            print $contactstatic->getNomUrl(1);
-	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+                $contactstatic->id=$obj->id;
+                $contactstatic->lastname=$obj->lastname;
+                $contactstatic->firstname=$obj->firstname;
+                print $contactstatic->getNomUrl(1);
+                print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
             }
             else
-			{
-				print $obj->email;
+            {
+                print $obj->email;
             }
             print '</td>';
             print '<td>';

Braces +57 added lines, -31 removed lines

@@ -38,15 +38,21 @@ 
 $actionid=GETPOST('actionid');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe','','');
 
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
 $sortfield=GETPOST("sortfield",'alpha');
 $sortorder=GETPOST("sortorder",'alpha');
 $page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if (! $sortorder) {
+    $sortorder="DESC";
+}
+if (! $sortfield) {
+    $sortfield="n.daten";
+}
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -67,7 +73,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -103,8 +111,7 @@ 
                     $error++;
                     dol_print_error($db);
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($db);
             }
@@ -112,8 +119,7 @@ 
             if (! $error)
             {
                 $db->commit();
-            }
-            else
+            } else
             {
                 $db->rollback();
             }
@@ -140,7 +146,9 @@ 
 $result=$object->fetch($socid);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Notification");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -163,17 +171,21 @@ 
     print '<table class="border centpercent">';
 
     // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+        // Old not used prefix field
     {
         print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
+    }
 
     if ($object->client)
     {
         print '<tr><td class="titlefield">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        if ($object->check_codeclient() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -182,7 +194,9 @@ 
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        if ($object->check_codefournisseur() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -262,8 +276,7 @@ 
         print '</td>';
         print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
-    }
-    else
+    } else
     {
         print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
         print $langs->trans("YouMustCreateContactFirst");
@@ -292,8 +305,7 @@ 
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
@@ -332,8 +344,7 @@ 
                 if (isValidEmail($obj->email))
                 {
                     print ' &lt;'.$obj->email.'&gt;';
-                }
-                else
+                } else
                 {
                     $langs->load("errors");
                     print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
@@ -345,8 +356,12 @@ 
             print $label;
             print '</td>';
             print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
+            if ($obj->type == 'email') {
+                print $langs->trans("Email");
+            }
+            if ($obj->type == 'sms') {
+                print $langs->trans("SMS");
+            }
             print '</td>';
             print '<td align="right"><a href="card.php?socid='.$socid.'&action=delete&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
             print '</tr>';
@@ -429,9 +444,11 @@ 
     {
         $result = $db->query($sql);
         $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+        if (($page * $limit) > $nbtotalofrecords) {
+            // if total resultset is smaller then paging size (filtering), goto and load page 0
         {
         	$page = 0;
+        }
         	$offset = 0;
         }
     }
@@ -442,18 +459,23 @@ 
     if ($resql)
     {
         $num = $db->num_rows($resql);
-    }
-    else
+    } else
     {
         dol_print_error($db);
     }
 
     $param='&socid='.$object->id;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+        $param.='&contextpage='.$contextpage;
+    }
+    if ($limit > 0 && $limit != $conf->liste_limit) {
+        $param.='&limit='.$limit;
+    }
 
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    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="sortfield" value="'.$sortfield.'">';
@@ -492,8 +514,7 @@ 
 	            $contactstatic->firstname=$obj->firstname;
 	            print $contactstatic->getNomUrl(1);
 	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
-            }
-            else
+            } else
 			{
 				print $obj->email;
             }
@@ -503,8 +524,12 @@ 
             print $label;
             print '</td>';
             print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
+            if ($obj->type == 'email') {
+                print $langs->trans("Email");
+            }
+            if ($obj->type == 'sms') {
+                print $langs->trans("Sms");
+            }
             print '</td>';
             // TODO Add link to object here for other types
             /*print '<td>';
@@ -526,8 +551,9 @@ 
     print '</table>';
 
     print '</form>';
+} else {
+    dol_print_error('','RecordNotFound');
 }
-else dol_print_error('','RecordNotFound');
 
 // End of page
 llxFooter();

Spacing +92 added lines, -92 removed lines

@@ -27,7 +27,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -35,32 +35,32 @@ 
 
 $langs->loadLangs(array("companies", "mails", "admin", "other"));
 
-$socid = GETPOST("socid",'int');
-$action = GETPOST('action','aZ09');
-$contactid=GETPOST('contactid');    // May be an int or 'thirdparty'
-$actionid=GETPOST('actionid');
+$socid = GETPOST("socid", 'int');
+$action = GETPOST('action', 'aZ09');
+$contactid = GETPOST('contactid'); // May be an int or 'thirdparty'
+$actionid = GETPOST('actionid');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'societe','','');
-
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield=GETPOST("sortfield",'alpha');
-$sortorder=GETPOST("sortorder",'alpha');
-$page=GETPOST("page",'int');
-if (! $sortorder) $sortorder="DESC";
-if (! $sortfield) $sortfield="n.daten";
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'societe', '', '');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "n.daten";
 if (empty($page) || $page == -1) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-$now=dol_now();
+$now = dol_now();
 
 $object = new Societe($db);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartynotification','globalcard'));
+$hookmanager->initHooks(array('thirdpartynotification', 'globalcard'));
 
 
 
@@ -68,29 +68,29 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
 {
-    $error=0;
+    $error = 0;
 
     // Add a notification
     if ($action == 'add')
     {
         if (empty($contactid))
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Contact")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
             $error++;
         }
         if ($actionid <= 0)
         {
-    	    setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Action")), null, 'errors');
+    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
             $error++;
         }
 
-        if (! $error)
+        if (!$error)
         {
             $db->begin();
 
@@ -101,7 +101,7 @@ 
                 $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
                 $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-                if (! $db->query($sql))
+                if (!$db->query($sql))
                 {
                     $error++;
                     dol_print_error($db);
@@ -112,7 +112,7 @@ 
                 dol_print_error($db);
             }
 
-            if (! $error)
+            if (!$error)
             {
                 $db->commit();
             }
@@ -140,12 +140,12 @@ 
 $form = new Form($db);
 
 $object = new Societe($db);
-$result=$object->fetch($socid);
+$result = $object->fetch($socid);
 
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Notification");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Notification");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 
 if ($result > 0)
@@ -158,7 +158,7 @@ 
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -166,7 +166,7 @@ 
     print '<table class="border centpercent">';
 
     // Prefix
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
@@ -180,7 +180,7 @@ 
         print '</td></tr>';
     }
 
-    if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire))
+    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
     {
         print '<tr><td class="titlefield">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
@@ -221,37 +221,37 @@ 
 
 
     // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"),'','');
+    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
     print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
     print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
     print '<input type="hidden" name="action" value="add">';
 
-    $param="&socid=".$socid;
+    $param = "&socid=".$socid;
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
     print_liste_field_titre('');
 	print "</tr>\n";
 
-    $var=false;
-    $listofemails=$object->thirdparty_and_contact_email_array();
+    $var = false;
+    $listofemails = $object->thirdparty_and_contact_email_array();
     if (count($listofemails) > 0)
     {
-        $actions=array();
+        $actions = array();
 
         // Load array of available notifications
-        $notificationtrigger=new InterfaceNotification($db);
-        $listofmanagedeventfornotification=$notificationtrigger->getListOfManagedEvents();
+        $notificationtrigger = new InterfaceNotification($db);
+        $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-        foreach($listofmanagedeventfornotification as $managedeventfornotification)
+        foreach ($listofmanagedeventfornotification as $managedeventfornotification)
         {
- 			$label=($langs->trans("Notify_".$managedeventfornotification['code'])!="Notify_".$managedeventfornotification['code']?$langs->trans("Notify_".$managedeventfornotification['code']):$managedeventfornotification['label']);
-            $actions[$managedeventfornotification['rowid']]=$label;
+ 			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
+            $actions[$managedeventfornotification['rowid']] = $label;
         }
         print '<tr class="oddeven"><td class="maxwidthonsmartphone">';
         print $form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
@@ -260,8 +260,8 @@ 
         print $form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
         print '</td>';
         print '<td>';
-        $type=array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid",$type);
+        $type = array('email'=>$langs->trans("EMail"));
+        print $form->selectarray("typeid", $type);
         print '</td>';
         print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
         print '</tr>';
@@ -282,16 +282,16 @@ 
 
     // List of notifications enabled for contacts
     $sql = "SELECT n.rowid, n.type,";
-    $sql.= " a.code, a.label,";
-    $sql.= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql.= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND c.rowid = n.fk_contact";
-    $sql.= " AND c.fk_soc = ".$object->id;
-
-    $resql=$db->query($sql);
+    $sql .= " a.code, a.label,";
+    $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+    $sql .= " ".MAIN_DB_PREFIX."socpeople c";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND c.rowid = n.fk_contact";
+    $sql .= " AND c.fk_soc = ".$object->id;
+
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -302,15 +302,15 @@ 
     }
 
     // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')','','');
+    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'"width="45%"',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'"width="35%"',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'"width="10%"',$sortfield,$sortorder);
-    print_liste_field_titre('','','');
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+    print_liste_field_titre('', '', '');
     print '</tr>';
 
 	$langs->load("errors");
@@ -320,15 +320,15 @@ 
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
             $obj = $db->fetch_object($resql);
 
-            $contactstatic->id=$obj->contactid;
-            $contactstatic->lastname=$obj->lastname;
-            $contactstatic->firstname=$obj->firstname;
+            $contactstatic->id = $obj->contactid;
+            $contactstatic->lastname = $obj->lastname;
+            $contactstatic->firstname = $obj->firstname;
             print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
             if ($obj->type == 'email')
             {
@@ -339,12 +339,12 @@ 
                 else
                 {
                     $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail",$obj->email);
+                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
                 }
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -417,14 +417,14 @@ 
 
     // List
     $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql.= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql.= " a.code, a.label";
-    $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql.= " ".MAIN_DB_PREFIX."notify as n ";
-    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
-    $sql.= " WHERE a.rowid = n.fk_action";
-    $sql.= " AND n.fk_soc = ".$object->id;
-    $sql.= $db->order($sortfield, $sortorder);
+    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+    $sql .= " a.code, a.label";
+    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+    $sql .= " ".MAIN_DB_PREFIX."notify as n ";
+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+    $sql .= " WHERE a.rowid = n.fk_action";
+    $sql .= " AND n.fk_soc = ".$object->id;
+    $sql .= $db->order($sortfield, $sortorder);
 
     // Count total nb of records
     $nbtotalofrecords = '';
@@ -439,9 +439,9 @@ 
         }
     }
 
-    $sql.= $db->plimit($limit+1, $offset);
+    $sql .= $db->plimit($limit + 1, $offset);
 
-    $resql=$db->query($sql);
+    $resql = $db->query($sql);
     if ($resql)
     {
         $num = $db->num_rows($resql);
@@ -451,9 +451,9 @@ 
         dol_print_error($db);
     }
 
-    $param='&socid='.$object->id;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    $param = '&socid='.$object->id;
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
     print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -470,18 +470,18 @@ 
     // Line with titles
     print '<table width="100%" class="noborder">';
     print '<tr class="liste_titre">';
-    print_liste_field_titre("Target",$_SERVER["PHP_SELF"],"c.lastname,c.firstname",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"",'',$param,'',$sortfield,$sortorder);
-    print_liste_field_titre("Type",$_SERVER["PHP_SELF"],"n.type",'',$param,'',$sortfield,$sortorder);
+    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
     //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"n.daten",'',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, 'align="right"', $sortfield, $sortorder);
     print '</tr>';
 
     if ($num > 0)
     {
         $i = 0;
 
-        $contactstatic=new Contact($db);
+        $contactstatic = new Contact($db);
 
         while ($i < $num)
         {
@@ -490,11 +490,11 @@ 
             print '<tr class="oddeven"><td>';
             if ($obj->id > 0)
             {
-	            $contactstatic->id=$obj->id;
-	            $contactstatic->lastname=$obj->lastname;
-	            $contactstatic->firstname=$obj->firstname;
+	            $contactstatic->id = $obj->id;
+	            $contactstatic->lastname = $obj->lastname;
+	            $contactstatic->firstname = $obj->firstname;
 	            print $contactstatic->getNomUrl(1);
-	            print $obj->email?' &lt;'.$obj->email.'&gt;':$langs->trans("NoMail");
+	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
             }
             else
 			{
@@ -502,7 +502,7 @@ 
             }
             print '</td>';
             print '<td>';
-            $label=($langs->trans("Notify_".$obj->code)!="Notify_".$obj->code?$langs->trans("Notify_".$obj->code):$obj->label);
+            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
             print $label;
             print '</td>';
             print '<td>';
@@ -530,7 +530,7 @@ 
 
     print '</form>';
 }
-else dol_print_error('','RecordNotFound');
+else dol_print_error('', 'RecordNotFound');
 
 // End of page
 llxFooter();

dolibarr/htdocs/societe/notify/index.php

Indentation +31 added lines, -31 removed lines

@@ -28,17 +28,17 @@ 
 // S�curit� acc�s client
 if ($user->societe_id > 0)
 {
-	$action = '';
-	$socid = $user->societe_id;
+    $action = '';
+    $socid = $user->societe_id;
 }
 
 if ($sortorder == "")
 {
-  $sortorder="ASC";
+    $sortorder="ASC";
 }
 if ($sortfield == "")
 {
-  $sortfield="s.nom";
+    $sortfield="s.nom";
 }
 
 if ($page == -1 || $page == null) { $page = 0 ; }
@@ -72,36 +72,36 @@ 
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
-	$i = 0;
-
-	$paramlist='';
-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($result);
-
-		print '<tr class="oddeven">';
-		print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
-		print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
-		print "<td>".$obj->titre."</td>\n";
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table>";
-	$db->free();
+    $num = $db->num_rows($result);
+    $i = 0;
+
+    $paramlist='';
+    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
+
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
+    print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
+    print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+    while ($i < $num)
+    {
+        $obj = $db->fetch_object($result);
+
+        print '<tr class="oddeven">';
+        print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
+        print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
+        print "<td>".$obj->titre."</td>\n";
+        print "</tr>\n";
+        $i++;
+    }
+    print "</table>";
+    $db->free();
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 // End of page

Braces +4 added lines, -3 removed lines

@@ -64,7 +64,9 @@ 
 $sql.= " AND a.rowid = n.fk_action";
 $sql.= " AND n.fk_soc = s.rowid";
 $sql.= " AND s.entity IN (".getEntity('societe').")";
-if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
+if ($socid > 0) {
+    $sql.= " AND s.rowid = " . $user->societe_id;
+}
 
 $sql.= $db->order($sortfield,$sortorder);
 $sql.= $db->plimit($conf->liste_limit, $offset);
@@ -98,8 +100,7 @@ 
 	}
 	print "</table>";
 	$db->free();
-}
-else
+} else
 {
 	dol_print_error($db);
 }

Spacing +22 added lines, -22 removed lines

@@ -25,7 +25,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 $langs->loadLangs(array("companies", "banks"));
 
 // S�curit� acc�s client
@@ -37,16 +37,16 @@ 
 
 if ($sortorder == "")
 {
-  $sortorder="ASC";
+  $sortorder = "ASC";
 }
 if ($sortfield == "")
 {
-  $sortfield="s.nom";
+  $sortfield = "s.nom";
 }
 
-if ($page == -1 || $page == null) { $page = 0 ; }
+if ($page == -1 || $page == null) { $page = 0; }
 
-$offset = $conf->liste_limit * $page ;
+$offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -59,18 +59,18 @@ 
 llxHeader();
 
 $sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
-$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
-$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
-$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-$sql.= " WHERE n.fk_contact = c.rowid";
-$sql.= " AND a.rowid = n.fk_action";
-$sql.= " AND n.fk_soc = s.rowid";
-$sql.= " AND s.entity IN (".getEntity('societe').")";
-if ($socid > 0)	$sql.= " AND s.rowid = " . $user->societe_id;
-
-$sql.= $db->order($sortfield,$sortorder);
-$sql.= $db->plimit($conf->liste_limit, $offset);
+$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
+$sql .= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
+$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+$sql .= " ".MAIN_DB_PREFIX."societe as s";
+$sql .= " WHERE n.fk_contact = c.rowid";
+$sql .= " AND a.rowid = n.fk_action";
+$sql .= " AND n.fk_soc = s.rowid";
+$sql .= " AND s.entity IN (".getEntity('societe').")";
+if ($socid > 0)	$sql .= " AND s.rowid = ".$user->societe_id;
+
+$sql .= $db->order($sortfield, $sortorder);
+$sql .= $db->plimit($conf->liste_limit, $offset);
 
 $result = $db->query($sql);
 if ($result)
@@ -78,14 +78,14 @@ 
 	$num = $db->num_rows($result);
 	$i = 0;
 
-	$paramlist='';
-	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield,$sortorder,'',$num);
+	$paramlist = '';
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $paramlist, $sortfield, $sortorder, '', $num);
 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"s.nom","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Contact",$_SERVER["PHP_SELF"],"c.lastname","","",'valign="center"',$sortfield,$sortorder);
-	print_liste_field_titre("Action",$_SERVER["PHP_SELF"],"a.titre","","",'valign="center"',$sortfield,$sortorder);
+	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Contact", $_SERVER["PHP_SELF"], "c.lastname", "", "", 'valign="center"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "a.titre", "", "", 'valign="center"', $sortfield, $sortorder);
 	print "</tr>\n";
 
 	while ($i < $num)

dolibarr/htdocs/societe/ajaxcompanies.php

Indentation +42 added lines, -42 removed lines

@@ -52,18 +52,18 @@ 
 // Generation liste des societes
 if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn'))
 {
-	$return_arr = array();
-
-	// Define filter on text typed
-	$socid = $_GET['newcompany']?$_GET['newcompany']:'';
-	if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
-	if (! $socid) $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
-
-	$sql = "SELECT rowid, nom";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= " WHERE s.entity IN (".getEntity('societe').")";
-	if ($socid)
-	{
+    $return_arr = array();
+
+    // Define filter on text typed
+    $socid = $_GET['newcompany']?$_GET['newcompany']:'';
+    if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
+    if (! $socid) $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+
+    $sql = "SELECT rowid, nom";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+    $sql.= " WHERE s.entity IN (".getEntity('societe').")";
+    if ($socid)
+    {
         $sql.=" AND (";
         // Add criteria on name/code
         if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
@@ -74,37 +74,37 @@ 
         }
         else
         {
-    		$sql.="nom LIKE '%" . $db->escape($socid) . "%'";
-    		$sql.=" OR code_client LIKE '%" . $db->escape($socid) . "%'";
-    		$sql.=" OR code_fournisseur LIKE '%" . $db->escape($socid) . "%'";
+            $sql.="nom LIKE '%" . $db->escape($socid) . "%'";
+            $sql.=" OR code_client LIKE '%" . $db->escape($socid) . "%'";
+            $sql.=" OR code_fournisseur LIKE '%" . $db->escape($socid) . "%'";
         }
-		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
-		$sql.=")";
-	}
-	if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters
-	$sql.= " ORDER BY nom ASC";
-
-	//dol_syslog("ajaxcompanies", LOG_DEBUG);
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		while ($row = $db->fetch_array($resql))
-		{
-		    $label=$row['nom'];
-		    if ($socid) $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
-			$row_array['label'] = $label;
-			$row_array['value'] = $row['nom'];
-	        $row_array['key'] = $row['rowid'];
-
-	        array_push($return_arr,$row_array);
-	    }
-
-	    echo json_encode($return_arr);
-	}
-	else
-	{
-	    echo json_encode(array('nom'=>'Error','label'=>'Error','key'=>'Error','value'=>'Error'));
-	}
+        if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
+        $sql.=")";
+    }
+    if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters
+    $sql.= " ORDER BY nom ASC";
+
+    //dol_syslog("ajaxcompanies", LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        while ($row = $db->fetch_array($resql))
+        {
+            $label=$row['nom'];
+            if ($socid) $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
+            $row_array['label'] = $label;
+            $row_array['value'] = $row['nom'];
+            $row_array['key'] = $row['rowid'];
+
+            array_push($return_arr,$row_array);
+        }
+
+        echo json_encode($return_arr);
+    }
+    else
+    {
+        echo json_encode(array('nom'=>'Error','label'=>'Error','key'=>'Error','value'=>'Error'));
+    }
 }
 else
 {

Braces +41 added lines, -18 removed lines

@@ -23,12 +23,25 @@ 
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
@@ -60,8 +73,12 @@ 
 
 	// Define filter on text typed
 	$socid = $_GET['newcompany']?$_GET['newcompany']:'';
-	if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
-	if (! $socid) $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+	if (! $socid) {
+	    $socid = $_GET['socid']?$_GET['socid']:'';
+	}
+	if (! $socid) {
+	    $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+	}
 
 	$sql = "SELECT rowid, nom";
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -70,22 +87,28 @@ 
 	{
         $sql.=" AND (";
         // Add criteria on name/code
-        if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
+        if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) {
+            // Can use index
         {
             $sql.="nom LIKE '" . $db->escape($socid) . "%'";
+        }
             $sql.=" OR code_client LIKE '" . $db->escape($socid) . "%'";
             $sql.=" OR code_fournisseur LIKE '" . $db->escape($socid) . "%'";
-        }
-        else
+        } else
         {
     		$sql.="nom LIKE '%" . $db->escape($socid) . "%'";
     		$sql.=" OR code_client LIKE '%" . $db->escape($socid) . "%'";
     		$sql.=" OR code_fournisseur LIKE '%" . $db->escape($socid) . "%'";
         }
-		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
+		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) {
+		    $sql.=" OR rowid = '" . $db->escape($socid) . "'";
+		}
 		$sql.=")";
 	}
-	if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters
+	if (GETPOST("filter")) {
+	    $sql.= " AND ".GETPOST("filter","alpha");
+	}
+	// Add other filters
 	$sql.= " ORDER BY nom ASC";
 
 	//dol_syslog("ajaxcompanies", LOG_DEBUG);
@@ -95,7 +118,9 @@ 
 		while ($row = $db->fetch_array($resql))
 		{
 		    $label=$row['nom'];
-		    if ($socid) $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
+		    if ($socid) {
+		        $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
+		    }
 			$row_array['label'] = $label;
 			$row_array['value'] = $row['nom'];
 	        $row_array['key'] = $row['rowid'];
@@ -104,13 +129,11 @@ 
 	    }
 
 	    echo json_encode($return_arr);
-	}
-	else
+	} else
 	{
 	    echo json_encode(array('nom'=>'Error','label'=>'Error','key'=>'Error','value'=>'Error'));
 	}
-}
-else
+} else
 {
     echo json_encode(array('nom'=>'ErrorBadParameter','label'=>'ErrorBadParameter','key'=>'ErrorBadParameter','value'=>'ErrorBadParameter'));
 }

Spacing +32 added lines, -32 removed lines

@@ -23,17 +23,17 @@ 
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 
 
@@ -50,67 +50,67 @@ 
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-dol_syslog(join(',',$_GET));
+dol_syslog(join(',', $_GET));
 
 
 // Generation liste des societes
-if (GETPOST('newcompany') || GETPOST('socid','int') || GETPOST('id_fourn'))
+if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn'))
 {
 	$return_arr = array();
 
 	// Define filter on text typed
-	$socid = $_GET['newcompany']?$_GET['newcompany']:'';
-	if (! $socid) $socid = $_GET['socid']?$_GET['socid']:'';
-	if (! $socid) $socid = $_GET['id_fourn']?$_GET['id_fourn']:'';
+	$socid = $_GET['newcompany'] ? $_GET['newcompany'] : '';
+	if (!$socid) $socid = $_GET['socid'] ? $_GET['socid'] : '';
+	if (!$socid) $socid = $_GET['id_fourn'] ? $_GET['id_fourn'] : '';
 
 	$sql = "SELECT rowid, nom";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql.= " WHERE s.entity IN (".getEntity('societe').")";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 	if ($socid)
 	{
-        $sql.=" AND (";
+        $sql .= " AND (";
         // Add criteria on name/code
-        if (! empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
+        if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE))   // Can use index
         {
-            $sql.="nom LIKE '" . $db->escape($socid) . "%'";
-            $sql.=" OR code_client LIKE '" . $db->escape($socid) . "%'";
-            $sql.=" OR code_fournisseur LIKE '" . $db->escape($socid) . "%'";
+            $sql .= "nom LIKE '".$db->escape($socid)."%'";
+            $sql .= " OR code_client LIKE '".$db->escape($socid)."%'";
+            $sql .= " OR code_fournisseur LIKE '".$db->escape($socid)."%'";
         }
         else
         {
-    		$sql.="nom LIKE '%" . $db->escape($socid) . "%'";
-    		$sql.=" OR code_client LIKE '%" . $db->escape($socid) . "%'";
-    		$sql.=" OR code_fournisseur LIKE '%" . $db->escape($socid) . "%'";
+    		$sql .= "nom LIKE '%".$db->escape($socid)."%'";
+    		$sql .= " OR code_client LIKE '%".$db->escape($socid)."%'";
+    		$sql .= " OR code_fournisseur LIKE '%".$db->escape($socid)."%'";
         }
-		if (! empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql.=" OR rowid = '" . $db->escape($socid) . "'";
-		$sql.=")";
+		if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql .= " OR rowid = '".$db->escape($socid)."'";
+		$sql .= ")";
 	}
-	if (GETPOST("filter")) $sql.= " AND ".GETPOST("filter","alpha"); // Add other filters
-	$sql.= " ORDER BY nom ASC";
+	if (GETPOST("filter")) $sql .= " AND ".GETPOST("filter", "alpha"); // Add other filters
+	$sql .= " ORDER BY nom ASC";
 
 	//dol_syslog("ajaxcompanies", LOG_DEBUG);
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
 		while ($row = $db->fetch_array($resql))
 		{
-		    $label=$row['nom'];
-		    if ($socid) $label=preg_replace('/('.preg_quote($socid,'/').')/i','<strong>$1</strong>',$label,1);
+		    $label = $row['nom'];
+		    if ($socid) $label = preg_replace('/('.preg_quote($socid, '/').')/i', '<strong>$1</strong>', $label, 1);
 			$row_array['label'] = $label;
 			$row_array['value'] = $row['nom'];
 	        $row_array['key'] = $row['rowid'];
 
-	        array_push($return_arr,$row_array);
+	        array_push($return_arr, $row_array);
 	    }
 
 	    echo json_encode($return_arr);
 	}
 	else
 	{
-	    echo json_encode(array('nom'=>'Error','label'=>'Error','key'=>'Error','value'=>'Error'));
+	    echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
 	}
 }
 else
 {
-    echo json_encode(array('nom'=>'ErrorBadParameter','label'=>'ErrorBadParameter','key'=>'ErrorBadParameter','value'=>'ErrorBadParameter'));
+    echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
 }

dolibarr/htdocs/societe/tpl/linesalesrepresentative.tpl.php

Indentation +16 added lines, -16 removed lines

@@ -18,8 +18,8 @@ 
 // Protection to avoid direct call of template
 if (empty($conf) || ! is_object($conf))
 {
-	print "Error, template page can't be called as URL";
-	exit;
+    print "Error, template page can't be called as URL";
+    exit;
 }
 
 // Sale representative
@@ -32,20 +32,20 @@ 
 $nbofsalesrepresentative=count($listsalesrepresentatives);
 if ($nbofsalesrepresentative > 0)
 {
-	$userstatic=new User($db);
-	foreach($listsalesrepresentatives as $val)
-	{
-		$userstatic->id=$val['id'];
-		$userstatic->login=$val['login'];
-		$userstatic->lastname=$val['lastname'];
-		$userstatic->firstname=$val['firstname'];
-		$userstatic->statut=$val['statut'];
-		$userstatic->photo=$val['photo'];
-		$userstatic->email=$val['email'];
-		$userstatic->entity=$val['entity'];
-		print $userstatic->getNomUrl(-1);
-		print ' ';
-	}
+    $userstatic=new User($db);
+    foreach($listsalesrepresentatives as $val)
+    {
+        $userstatic->id=$val['id'];
+        $userstatic->login=$val['login'];
+        $userstatic->lastname=$val['lastname'];
+        $userstatic->firstname=$val['firstname'];
+        $userstatic->statut=$val['statut'];
+        $userstatic->photo=$val['photo'];
+        $userstatic->email=$val['email'];
+        $userstatic->entity=$val['entity'];
+        print $userstatic->getNomUrl(-1);
+        print ' ';
+    }
 }
 else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 print '</td></tr>';

Spacing +13 added lines, -13 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || ! is_object($conf))
+if (empty($conf) || !is_object($conf))
 {
 	print "Error, template page can't be called as URL";
 	exit;
@@ -28,21 +28,21 @@ 
 print '</td>';
 print '<td>';
 
-$listsalesrepresentatives=$object->getSalesRepresentatives($user);
-$nbofsalesrepresentative=count($listsalesrepresentatives);
+$listsalesrepresentatives = $object->getSalesRepresentatives($user);
+$nbofsalesrepresentative = count($listsalesrepresentatives);
 if ($nbofsalesrepresentative > 0)
 {
-	$userstatic=new User($db);
-	foreach($listsalesrepresentatives as $val)
+	$userstatic = new User($db);
+	foreach ($listsalesrepresentatives as $val)
 	{
-		$userstatic->id=$val['id'];
-		$userstatic->login=$val['login'];
-		$userstatic->lastname=$val['lastname'];
-		$userstatic->firstname=$val['firstname'];
-		$userstatic->statut=$val['statut'];
-		$userstatic->photo=$val['photo'];
-		$userstatic->email=$val['email'];
-		$userstatic->entity=$val['entity'];
+		$userstatic->id = $val['id'];
+		$userstatic->login = $val['login'];
+		$userstatic->lastname = $val['lastname'];
+		$userstatic->firstname = $val['firstname'];
+		$userstatic->statut = $val['statut'];
+		$userstatic->photo = $val['photo'];
+		$userstatic->email = $val['email'];
+		$userstatic->entity = $val['entity'];
 		print $userstatic->getNomUrl(-1);
 		print ' ';
 	}

Braces +2 added lines, -1 removed lines

@@ -46,7 +46,8 @@
 		print $userstatic->getNomUrl(-1);
 		print ' ';
 	}
+} else {
+    print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 }
-else print '<span class="opacitymedium">'.$langs->trans("NoSalesRepresentativeAffected").'</span>';
 print '</td></tr>';
 

dolibarr/htdocs/societe/consumption.php

Indentation +335 added lines, -335 removed lines

@@ -100,8 +100,8 @@ 
 
 if (empty($socid))
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $head = societe_prepare_head($object);
@@ -118,50 +118,50 @@ 
 
 if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 {
-	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
 
 //if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
 
 if ($object->client)
 {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('CustomerCode').'</td><td colspan="3">';
-	print $object->code_client;
-	if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-	print '</td></tr>';
-	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
-	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
-
-	$obj = $db->fetch_object($resql);
-	$nbFactsClient = $obj->nb;
-	$thirdTypeArray['customer']=$langs->trans("customer");
-	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
-	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
-	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
-	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+    print '<tr><td class="titlefield">';
+    print $langs->trans('CustomerCode').'</td><td colspan="3">';
+    print $object->code_client;
+    if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+    print '</td></tr>';
+    $sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
+    $resql=$db->query($sql);
+    if (!$resql) dol_print_error($db);
+
+    $obj = $db->fetch_object($resql);
+    $nbFactsClient = $obj->nb;
+    $thirdTypeArray['customer']=$langs->trans("customer");
+    if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
+    if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
+    if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
+    if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
 }
 
 if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
 
 if ($object->fournisseur)
 {
-	print '<tr><td class="titlefield">';
-	print $langs->trans('SupplierCode').'</td><td colspan="3">';
-	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-	print '</td></tr>';
-	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
-	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
-
-	$obj = $db->fetch_object($resql);
-	$nbCmdsFourn = $obj->nb;
-	$thirdTypeArray['supplier']=$langs->trans("supplier");
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
-	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
+    print '<tr><td class="titlefield">';
+    print $langs->trans('SupplierCode').'</td><td colspan="3">';
+    print $object->code_fournisseur;
+    if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+    print '</td></tr>';
+    $sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
+    $resql=$db->query($sql);
+    if (!$resql) dol_print_error($db);
+
+    $obj = $db->fetch_object($resql);
+    $nbCmdsFourn = $obj->nb;
+    $thirdTypeArray['supplier']=$langs->trans("supplier");
+    if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
+    if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
+    if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
 }
 print '</table>';
 
@@ -187,66 +187,66 @@ 
 }*/
 if ($type_element == 'fichinter')
 { 	// Customer : show products from invoices
-	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-	$documentstatic=new Fichinter($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid";	// Must use left join to work also with option that disable usage of lines.
-	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND f.entity = ".$conf->entity;
-	$dateprint = 'f.datec';
-	$doc_number='f.ref';
+    require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+    $documentstatic=new Fichinter($db);
+    $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid";	// Must use left join to work also with option that disable usage of lines.
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND f.entity = ".$conf->entity;
+    $dateprint = 'f.datec';
+    $doc_number='f.ref';
 }
 if ($type_element == 'invoice')
 { 	// Customer : show products from invoices
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-	$documentstatic=new Facture($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
-	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
-	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
-	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+    $documentstatic=new Facture($db);
+    $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
+    $tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_facture = f.rowid";
+    $where.= " AND f.entity = ".$conf->entity;
+    $dateprint = 'f.datef';
+    $doc_number='f.ref';
+    $thirdTypeSelect='customer';
 }
 if ($type_element == 'propal')
 {
-	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-	$documentstatic=new Propal($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_propal = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$datePrint = 'c.datep';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+    $documentstatic=new Propal($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_propal = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $datePrint = 'c.datep';
+    $doc_number='c.ref';
+    $thirdTypeSelect='customer';
 }
 if ($type_element == 'order')
 {
-	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-	$documentstatic=new Commande($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$dateprint = 'c.date_commande';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+    $documentstatic=new Commande($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_commande = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $dateprint = 'c.date_commande';
+    $doc_number='c.ref';
+    $thirdTypeSelect='customer';
 }
 if ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-	$documentstatic=new FactureFournisseur($db);
-	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
-	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
-	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture_fourn = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
-	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='supplier';
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+    $documentstatic=new FactureFournisseur($db);
+    $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
+    $tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_facture_fourn = f.rowid";
+    $where.= " AND f.entity = ".$conf->entity;
+    $dateprint = 'f.datef';
+    $doc_number='f.ref';
+    $thirdTypeSelect='supplier';
 }
 if ($type_element == 'supplier_proposal')
 {
@@ -263,30 +263,30 @@ 
 }
 if ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
-	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-	$documentstatic=new CommandeFournisseur($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='supplier';
+    require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+    $documentstatic=new CommandeFournisseur($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_commande = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $dateprint = 'c.date_valid';
+    $doc_number='c.ref';
+    $thirdTypeSelect='supplier';
 }
 if ($type_element == 'contract')
 { 	// Order
-	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-	$documentstatic=new Contrat($db);
-	$documentstaticline=new ContratLigne($db);
-	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
-	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_contrat = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
-	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+    $documentstatic=new Contrat($db);
+    $documentstaticline=new ContratLigne($db);
+    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, ';
+    $tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+    $where.= " AND d.fk_contrat = c.rowid";
+    $where.= " AND c.entity = ".$conf->entity;
+    $dateprint = 'c.date_valid';
+    $doc_number='c.ref';
+    $thirdTypeSelect='customer';
 }
 
 $parameters=array();
@@ -294,45 +294,45 @@ 
 
 if (!empty($sql_select))
 {
-	$sql = $sql_select;
-	$sql.= ' d.description as description,';
-	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
-	$sql.= " s.rowid as socid ";
-	if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
-	if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
-	$sql.= $where;
-	if ($month > 0) {
-		if ($year > 0) {
-			$start = dol_mktime(0, 0, 0, $month, 1, $year);
-			$end = dol_time_plus_duree($start,1,'m') - 1;
-			$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
-		} else {
-			$sql.= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d',$month)."'";
-		}
-	} else if ($year > 0) {
-		$start = dol_mktime(0, 0, 0, 1, 1, $year);
-		$end = dol_time_plus_duree($start,1,'y') - 1;
-		$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
-	}
-	if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
-	if ($sprod_fulldescr)
-	{
-	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    $sql.=")";
-	}
-	$sql.= $db->order($sortfield,$sortorder);
-
-	$resql=$db->query($sql);
-	$totalnboflines = $db->num_rows($resql);
-
-	$sql.= $db->plimit($limit + 1, $offset);
-	//print $sql;
+    $sql = $sql_select;
+    $sql.= ' d.description as description,';
+    if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+    if ($type_element == 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+    if ($type_element == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+    if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+    $sql.= " s.rowid as socid ";
+    if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
+    $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
+    if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+    $sql.= $where;
+    if ($month > 0) {
+        if ($year > 0) {
+            $start = dol_mktime(0, 0, 0, $month, 1, $year);
+            $end = dol_time_plus_duree($start,1,'m') - 1;
+            $sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
+        } else {
+            $sql.= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d',$month)."'";
+        }
+    } else if ($year > 0) {
+        $start = dol_mktime(0, 0, 0, 1, 1, $year);
+        $end = dol_time_plus_duree($start,1,'y') - 1;
+        $sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
+    }
+    if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+    if ($sprod_fulldescr)
+    {
+        $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+        if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+        if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+        $sql.=")";
+    }
+    $sql.= $db->order($sortfield,$sortorder);
+
+    $resql=$db->query($sql);
+    $totalnboflines = $db->num_rows($resql);
+
+    $sql.= $db->plimit($limit + 1, $offset);
+    //print $sql;
 }
 
 $disabled=0;
@@ -359,19 +359,19 @@ 
 
 if ($sql_select)
 {
-	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+    $resql=$db->query($sql);
+    if (!$resql) dol_print_error($db);
 
-	$num = $db->num_rows($resql);
+    $num = $db->num_rows($resql);
 
-	$param="&socid=".$socid."&type_element=".$type_element;
+    $param="&socid=".$socid."&type_element=".$type_element;
     if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sprod_fulldescr) $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
-	if ($sref) $param.= "&sref=".urlencode($sref);
-	if ($month) $param.= "&month=".$month;
-	if ($year) $param.= "&year=".$year;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+    if ($sprod_fulldescr) $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+    if ($sref) $param.= "&sref=".urlencode($sref);
+    if ($month) $param.= "&month=".$month;
+    if ($year) $param.= "&year=".$year;
+    if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
 
@@ -414,167 +414,167 @@ 
     print "</tr>\n";
 
 
-	$i = 0;
-	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
-	{
-		$documentstatic->id=$objp->doc_id;
-		$documentstatic->ref=$objp->doc_number;
-		$documentstatic->type=$objp->doc_type;
-		$documentstatic->fk_statut=$objp->status;
-		$documentstatic->fk_status=$objp->status;
-		$documentstatic->statut=$objp->status;
-		$documentstatic->status=$objp->status;
-		$documentstatic->paye=$objp->paid;
-
-		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
-
-		print '<tr class="oddeven">';
-		print '<td class="nobordernopadding nowrap" width="100">';
-		print $documentstatic->getNomUrl(1);
-		print '</td>';
-		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint),'day').'</td>';
-
-		// Status
-		print '<td align="center">';
-		if ($type_element == 'contract')
-		{
-			print $documentstaticline->getLibStatut(2);
-		}
-		else
-		{
-			print $documentstatic->getLibStatut(2);
-		}
-		print '</td>';
-
-		print '<td>';
-
-		// Define text, description and type
-		$text=''; $description=''; $type=0;
-
-		// Code to show product duplicated from commonobject->printObjectLine
-		if ($objp->fk_product > 0)
-		{
-			$product_static = new Product($db);
-
-			$product_static->type=$objp->fk_product_type;
-			$product_static->id=$objp->fk_product;
-			$product_static->ref=$objp->ref;
-			$product_static->entity=$objp->pentity;
-			$text=$product_static->getNomUrl(1);
-		}
-
-		// Product
-		if ($objp->fk_product > 0)
-		{
-			// Define output language
-			if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-			{
-				$prod = new Product($db);
-				$prod->fetch($objp->fk_product);
-
-				$outputlangs = $langs;
-				$newlang='';
-				if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-				if (empty($newlang)) $newlang=$object->default_lang;
-				if (! empty($newlang))
-				{
-					$outputlangs = new Translate("",$conf);
-					$outputlangs->setDefaultLang($newlang);
-				}
-
-				$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
-			{
-				$label = $objp->product_label;
-			}
-
-			$text.= ' - '.(! empty($objp->label)?$objp->label:$label);
-			$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
-		}
-
-		if (($objp->info_bits & 2) == 2) { ?>
+    $i = 0;
+    while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
+    {
+        $documentstatic->id=$objp->doc_id;
+        $documentstatic->ref=$objp->doc_number;
+        $documentstatic->type=$objp->doc_type;
+        $documentstatic->fk_statut=$objp->status;
+        $documentstatic->fk_status=$objp->status;
+        $documentstatic->statut=$objp->status;
+        $documentstatic->status=$objp->status;
+        $documentstatic->paye=$objp->paid;
+
+        if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
+
+        print '<tr class="oddeven">';
+        print '<td class="nobordernopadding nowrap" width="100">';
+        print $documentstatic->getNomUrl(1);
+        print '</td>';
+        print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint),'day').'</td>';
+
+        // Status
+        print '<td align="center">';
+        if ($type_element == 'contract')
+        {
+            print $documentstaticline->getLibStatut(2);
+        }
+        else
+        {
+            print $documentstatic->getLibStatut(2);
+        }
+        print '</td>';
+
+        print '<td>';
+
+        // Define text, description and type
+        $text=''; $description=''; $type=0;
+
+        // Code to show product duplicated from commonobject->printObjectLine
+        if ($objp->fk_product > 0)
+        {
+            $product_static = new Product($db);
+
+            $product_static->type=$objp->fk_product_type;
+            $product_static->id=$objp->fk_product;
+            $product_static->ref=$objp->ref;
+            $product_static->entity=$objp->pentity;
+            $text=$product_static->getNomUrl(1);
+        }
+
+        // Product
+        if ($objp->fk_product > 0)
+        {
+            // Define output language
+            if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+            {
+                $prod = new Product($db);
+                $prod->fetch($objp->fk_product);
+
+                $outputlangs = $langs;
+                $newlang='';
+                if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
+                if (empty($newlang)) $newlang=$object->default_lang;
+                if (! empty($newlang))
+                {
+                    $outputlangs = new Translate("",$conf);
+                    $outputlangs->setDefaultLang($newlang);
+                }
+
+                $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+            }
+            else
+            {
+                $label = $objp->product_label;
+            }
+
+            $text.= ' - '.(! empty($objp->label)?$objp->label:$label);
+            $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
+        }
+
+        if (($objp->info_bits & 2) == 2) { ?>
 			<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$object->id; ?>">
 			<?php
-			$txt='';
-			print img_object($langs->trans("ShowReduc"),'reduc').' ';
-			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
-			//else $txt=$langs->trans("Discount");
-			print $txt;
-			?>
+            $txt='';
+            print img_object($langs->trans("ShowReduc"),'reduc').' ';
+            if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
+            elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
+            elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+            //else $txt=$langs->trans("Discount");
+            print $txt;
+            ?>
 			</a>
 			<?php
-			if ($objp->description)
-			{
-				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
-				{
-					$discount=new DiscountAbsolute($db);
-					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-				}
-				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
-				{
-					$discount=new DiscountAbsolute($db);
-					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
-				{
-					$discount=new DiscountAbsolute($db);
-					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
-				{
-					$discount=new DiscountAbsolute($db);
-					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
-					// Add date of deposit
-					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else
-				{
-					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
-				}
-			}
-		}
-		else
-		{
-			if ($objp->fk_product > 0) {
-
-				echo $form->textwithtooltip($text,$description,3,'','',$i,0,'');
-
-				// Show range
-				echo get_date_range($objp->date_start, $objp->date_end);
-
-				// Add description in form
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
-				{
-					print (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
-				}
-			} else {
-
-				if (! empty($objp->label) || ! empty($objp->description))
-				{
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
-
-					if (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
-					} else {
-						echo $text.' '.dol_htmlentitiesbr($objp->description);
-					}
-				}
-
-				// Show range
-				echo get_date_range($objp->date_start,$objp->date_end);
-			}
-		}
-
-		/*
+            if ($objp->description)
+            {
+                if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
+                {
+                    $discount=new DiscountAbsolute($db);
+                    $discount->fetch($objp->fk_remise_except);
+                    echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+                }
+                if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+                {
+                    $discount=new DiscountAbsolute($db);
+                    $discount->fetch($objp->fk_remise_except);
+                    echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+                }
+                elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+                {
+                    $discount=new DiscountAbsolute($db);
+                    $discount->fetch($objp->fk_remise_except);
+                    echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+                }
+                elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+                {
+                    $discount=new DiscountAbsolute($db);
+                    $discount->fetch($objp->fk_remise_except);
+                    echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+                    // Add date of deposit
+                    if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
+                }
+                else
+                {
+                    echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
+                }
+            }
+        }
+        else
+        {
+            if ($objp->fk_product > 0) {
+
+                echo $form->textwithtooltip($text,$description,3,'','',$i,0,'');
+
+                // Show range
+                echo get_date_range($objp->date_start, $objp->date_end);
+
+                // Add description in form
+                if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+                {
+                    print (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+                }
+            } else {
+
+                if (! empty($objp->label) || ! empty($objp->description))
+                {
+                    if ($type==1) $text = img_object($langs->trans('Service'),'service');
+                    else $text = img_object($langs->trans('Product'),'product');
+
+                    if (! empty($objp->label)) {
+                        $text.= ' <strong>'.$objp->label.'</strong>';
+                        echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
+                    } else {
+                        echo $text.' '.dol_htmlentitiesbr($objp->description);
+                    }
+                }
+
+                // Show range
+                echo get_date_range($objp->date_start,$objp->date_end);
+            }
+        }
+
+        /*
 		$prodreftxt='';
 		if ($objp->prod_id > 0)
 		{
@@ -592,35 +592,35 @@ 
 			$prodreftxt .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 		}
 		*/
-		print '</td>';
+        print '</td>';
 
-		//print '<td align="left">'.$prodreftxt.'</td>';
+        //print '<td align="left">'.$prodreftxt.'</td>';
 
-		print '<td align="right">'.$objp->prod_qty.'</td>';
-		$total_qty+=$objp->prod_qty;
+        print '<td align="right">'.$objp->prod_qty.'</td>';
+        $total_qty+=$objp->prod_qty;
 
-		print '<td align="right">'.price($objp->total_ht).'</td>';
-		$total_ht+=$objp->total_ht;
+        print '<td align="right">'.price($objp->total_ht).'</td>';
+        $total_ht+=$objp->total_ht;
 
-		print '<td align="right">'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).'</td>';
+        print '<td align="right">'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).'</td>';
 
-		print "</tr>\n";
-		$i++;
-	}
+        print "</tr>\n";
+        $i++;
+    }
 
-	print '<tr class="liste_total">';
-	print '<td>' . $langs->trans('Total') . '</td>';
-	print '<td colspan="3"></td>';
-	print '<td align="right">' . $total_qty . '</td>';
-	print '<td align="right">' . price($total_ht) . '</td>';
-	print '<td align="right">' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '</td>';
-	print "</table>";
-	print '</div>';
+    print '<tr class="liste_total">';
+    print '<td>' . $langs->trans('Total') . '</td>';
+    print '<td colspan="3"></td>';
+    print '<td align="right">' . $total_qty . '</td>';
+    print '<td align="right">' . price($total_ht) . '</td>';
+    print '<td align="right">' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '</td>';
+    print "</table>";
+    print '</div>';
 
-	if ($num > $limit) {
-		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
-	}
-	$db->free($resql);
+    if ($num > $limit) {
+        print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
+    }
+    $db->free($resql);
 }
 else if (empty($type_element) || $type_element == -1)
 {
@@ -636,18 +636,18 @@ 
     print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
     print "</tr>\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
+    print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
-	print "</table>";
+    print "</table>";
 }
 else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
     print '<table class="liste" width="100%">'."\n";
 
-	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+    print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 
-	print "</table>";
+    print "</table>";
 }
 
 print "</form>";

Braces +145 added lines, -64 removed lines

@@ -33,10 +33,14 @@ 
 
 // Security check
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 $object = new Societe($db);
-if ($socid > 0) $object->fetch($socid);
+if ($socid > 0) {
+    $object->fetch($socid);
+}
 
 // Sort & Order fields
 $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
@@ -47,8 +51,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='dateprint';
+if (! $sortorder) {
+    $sortorder='DESC';
+}
+if (! $sortfield) {
+    $sortfield='dateprint';
+}
 
 // Search fields
 $sref=GETPOST("sref");
@@ -57,9 +65,11 @@ 
 $year	= GETPOST('year','int');
 
 // Clean up on purge search criteria ?
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) {
+    // Both test are required to be compatible with all browsers
 {
     $sref='';
+}
     $sprod_fulldescr='';
     $year='';
     $month='';
@@ -81,7 +91,9 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 
@@ -94,7 +106,9 @@ 
 $productstatic=new Product($db);
 
 $title = $langs->trans("Referers",$object->name);
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name." - ".$title;
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -116,10 +130,12 @@ 
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border" width="100%">';
 
-if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+    // Old not used prefix field
 {
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
+}
 
 //if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
 
@@ -128,41 +144,65 @@ 
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CustomerCode').'</td><td colspan="3">';
 	print $object->code_client;
-	if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+	if ($object->check_codeclient() <> 0) {
+	    print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+	}
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+	    dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 	$nbFactsClient = $obj->nb;
 	$thirdTypeArray['customer']=$langs->trans("customer");
-	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
-	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
-	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
-	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
-}
+	if ($conf->propal->enabled && $user->rights->propal->lire) {
+	    $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
+	}
+	if ($conf->commande->enabled && $user->rights->commande->lire) {
+	    $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
+	}
+	if ($conf->facture->enabled && $user->rights->facture->lire) {
+	    $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
+	}
+	if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+	    $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+	}
+	}
 
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
+if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) {
+    $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
+}
 
 if ($object->fournisseur)
 {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode').'</td><td colspan="3">';
 	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+	if ($object->check_codefournisseur() <> 0) {
+	    print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+	}
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
 	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+	    dol_print_error($db);
+	}
 
 	$obj = $db->fetch_object($resql);
 	$nbCmdsFourn = $obj->nb;
 	$thirdTypeArray['supplier']=$langs->trans("supplier");
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
-	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
-}
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) {
+	    $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
+	}
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) {
+	    $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
+	}
+	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) {
+	    $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
+	}
+	}
 print '</table>';
 
 print '</div>';
@@ -296,14 +336,26 @@ 
 {
 	$sql = $sql_select;
 	$sql.= ' d.description as description,';
-	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') {
+	    $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'supplier_proposal') {
+	    $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'contract') {
+	    $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element != 'fichinter') {
+	    $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+	}
 	$sql.= " s.rowid as socid ";
-	if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
+	if ($type_element != 'fichinter') {
+	    $sql.= ", p.ref as prod_ref, p.label as product_label";
+	}
 	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
-	if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	if ($type_element != 'fichinter') {
+	    $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	}
 	$sql.= $where;
 	if ($month > 0) {
 		if ($year > 0) {
@@ -318,12 +370,18 @@ 
 		$end = dol_time_plus_duree($start,1,'y') - 1;
 		$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
 	}
-	if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+	if ($sref) {
+	    $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+	}
 	if ($sprod_fulldescr)
 	{
 	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    if (GETPOST('type_element') != 'fichinter') {
+	        $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    }
+	    if (GETPOST('type_element') != 'fichinter') {
+	        $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    }
 	    $sql.=")";
 	}
 	$sql.= $db->order($sortfield,$sortorder);
@@ -360,18 +418,34 @@ 
 if ($sql_select)
 {
 	$resql=$db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+	    dol_print_error($db);
+	}
 
 	$num = $db->num_rows($resql);
 
 	$param="&socid=".$socid."&type_element=".$type_element;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sprod_fulldescr) $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
-	if ($sref) $param.= "&sref=".urlencode($sref);
-	if ($month) $param.= "&month=".$month;
-	if ($year) $param.= "&year=".$year;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+        $param.='&contextpage='.$contextpage;
+    }
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+	    $param.='&limit='.$limit;
+	}
+	if ($sprod_fulldescr) {
+	    $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+	}
+	if ($sref) {
+	    $param.= "&sref=".urlencode($sref);
+	}
+	if ($month) {
+	    $param.= "&month=".$month;
+	}
+	if ($year) {
+	    $param.= "&year=".$year;
+	}
+	if ($optioncss != '') {
+	    $param.='&optioncss='.$optioncss;
+	}
 
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
 
@@ -426,7 +500,9 @@ 
 		$documentstatic->status=$objp->status;
 		$documentstatic->paye=$objp->paid;
 
-		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
+		if (is_object($documentstaticline)) {
+		    $documentstaticline->statut=$objp->status;
+		}
 
 		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
@@ -439,8 +515,7 @@ 
 		if ($type_element == 'contract')
 		{
 			print $documentstaticline->getLibStatut(2);
-		}
-		else
+		} else
 		{
 			print $documentstatic->getLibStatut(2);
 		}
@@ -474,8 +549,12 @@ 
 
 				$outputlangs = $langs;
 				$newlang='';
-				if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-				if (empty($newlang)) $newlang=$object->default_lang;
+				if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+				    $newlang=GETPOST('lang_id','aZ09');
+				}
+				if (empty($newlang)) {
+				    $newlang=$object->default_lang;
+				}
 				if (! empty($newlang))
 				{
 					$outputlangs = new Translate("",$conf);
@@ -483,8 +562,7 @@ 
 				}
 
 				$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-			}
-			else
+			} else
 			{
 				$label = $objp->product_label;
 			}
@@ -498,9 +576,13 @@ 
 			<?php
 			$txt='';
 			print img_object($langs->trans("ShowReduc"),'reduc').' ';
-			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+			if ($objp->description == '(DEPOSIT)') {
+			    $txt=$langs->trans("Deposit");
+			} elseif ($objp->description == '(EXCESS RECEIVED)') {
+			    $txt=$langs->trans("ExcessReceived");
+			} elseif ($objp->description == '(EXCESS PAID)') {
+			    $txt=$langs->trans("ExcessPaid");
+			}
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
@@ -519,28 +601,26 @@ 
 					$discount=new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
 					$discount=new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-				}
-				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
 					$discount=new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 					// Add date of deposit
-					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
-				}
-				else
+					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+					    echo ' ('.dol_print_date($discount->datec).')';
+					}
+				} else
 				{
 					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
 				}
 			}
-		}
-		else
+		} else
 		{
 			if ($objp->fk_product > 0) {
 
@@ -558,8 +638,11 @@ 
 
 				if (! empty($objp->label) || ! empty($objp->description))
 				{
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
+					if ($type==1) {
+					    $text = img_object($langs->trans('Service'),'service');
+					} else {
+					    $text = img_object($langs->trans('Product'),'product');
+					}
 
 					if (! empty($objp->label)) {
 						$text.= ' <strong>'.$objp->label.'</strong>';
@@ -621,8 +704,7 @@ 
 		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
 	}
 	$db->free($resql);
-}
-else if (empty($type_element) || $type_element == -1)
+} else if (empty($type_element) || $type_element == -1)
 {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
@@ -639,8 +721,7 @@ 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
 
 	print "</table>";
-}
-else {
+} else {
     print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
 
     print '<table class="liste" width="100%">'."\n";

Spacing +204 added lines, -204 removed lines

@@ -26,7 +26,7 @@ 
  *	\brief      Add a tab on thirpdarty view to list all products/services bought or sells by thirdparty
  */
 
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -34,41 +34,41 @@ 
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
 // Security check
-$socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+$socid = GETPOST('socid', 'int');
+if ($user->societe_id) $socid = $user->societe_id;
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 $object = new Societe($db);
 if ($socid > 0) $object->fetch($socid);
 
 // Sort & Order fields
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$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;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='dateprint';
+if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) $sortfield = 'dateprint';
 
 // Search fields
-$sref=GETPOST("sref");
-$sprod_fulldescr=GETPOST("sprod_fulldescr");
-$month	= GETPOST('month','int');
-$year	= GETPOST('year','int');
+$sref = GETPOST("sref");
+$sprod_fulldescr = GETPOST("sprod_fulldescr");
+$month = GETPOST('month', 'int');
+$year = GETPOST('year', 'int');
 
 // Clean up on purge search criteria ?
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 {
-    $sref='';
-    $sprod_fulldescr='';
-    $year='';
-    $month='';
+    $sref = '';
+    $sprod_fulldescr = '';
+    $year = '';
+    $month = '';
 }
 // Customer or supplier selected in drop box
 $thirdTypeSelect = GETPOST("third_select_id");
-$type_element = GETPOST('type_element')?GETPOST('type_element'):'';
+$type_element = GETPOST('type_element') ?GETPOST('type_element') : '';
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
@@ -81,8 +81,8 @@ 
  * Actions
  */
 
-$parameters=array('id'=>$socid);
-$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array('id'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 
@@ -93,12 +93,12 @@ 
 
 $form = new Form($db);
 $formother = new FormOther($db);
-$productstatic=new Product($db);
+$productstatic = new Product($db);
 
-$title = $langs->trans("Referers",$object->name);
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("Referers", $object->name);
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$title;
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 if (empty($socid))
 {
@@ -111,14 +111,14 @@ 
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
 print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border" width="100%">';
 
-if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 {
 	print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 }
@@ -133,19 +133,19 @@ 
 	if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if (!$resql) dol_print_error($db);
 
 	$obj = $db->fetch_object($resql);
 	$nbFactsClient = $obj->nb;
-	$thirdTypeArray['customer']=$langs->trans("customer");
-	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
-	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
-	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
-	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+	$thirdTypeArray['customer'] = $langs->trans("customer");
+	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
+	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
+	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
+	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 }
 
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter']=$langs->transnoentitiesnoconv('Interventions');
+if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
 
 if ($object->fournisseur)
 {
@@ -155,15 +155,15 @@ 
 	if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
 	print '</td></tr>';
 	$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."commande_fournisseur where fk_soc = ".$socid;
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if (!$resql) dol_print_error($db);
 
 	$obj = $db->fetch_object($resql);
 	$nbCmdsFourn = $obj->nb;
-	$thirdTypeArray['supplier']=$langs->trans("supplier");
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice']=$langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order']=$langs->transnoentitiesnoconv('SuppliersOrders');
-	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
+	$thirdTypeArray['supplier'] = $langs->trans("supplier");
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
+	if ($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
+	if ($conf->fournisseur->enabled && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal'] = $langs->transnoentitiesnoconv('SupplierProposals');
 }
 print '</table>';
 
@@ -176,7 +176,7 @@ 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?socid='.$socid.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 
-$sql_select='';
+$sql_select = '';
 /*if ($type_element == 'action')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -190,192 +190,192 @@ 
 if ($type_element == 'fichinter')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-	$documentstatic=new Fichinter($db);
+	$documentstatic = new Fichinter($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, ';
-	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid";	// Must use left join to work also with option that disable usage of lines.
+	$tables_from = MAIN_DB_PREFIX."fichinter as f LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as d ON d.fk_fichinter = f.rowid"; // Must use left join to work also with option that disable usage of lines.
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND f.entity = ".$conf->entity;
+	$where .= " AND f.entity = ".$conf->entity;
 	$dateprint = 'f.datec';
-	$doc_number='f.ref';
+	$doc_number = 'f.ref';
 }
 if ($type_element == 'invoice')
 { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-	$documentstatic=new Facture($db);
+	$documentstatic = new Facture($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
 	$tables_from = MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."facturedet as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
+	$where .= " AND d.fk_facture = f.rowid";
+	$where .= " AND f.entity = ".$conf->entity;
 	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'f.ref';
+	$thirdTypeSelect = 'customer';
 }
 if ($type_element == 'propal')
 {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-	$documentstatic=new Propal($db);
+	$documentstatic = new Propal($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."propal as c,".MAIN_DB_PREFIX."propaldet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_propal = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_propal = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$datePrint = 'c.datep';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'customer';
 }
 if ($type_element == 'order')
 {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-	$documentstatic=new Commande($db);
+	$documentstatic = new Commande($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."commande as c,".MAIN_DB_PREFIX."commandedet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_commande = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$dateprint = 'c.date_commande';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'customer';
 }
 if ($type_element == 'supplier_invoice')
 { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-	$documentstatic=new FactureFournisseur($db);
+	$documentstatic = new FactureFournisseur($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
 	$tables_from = MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."facture_fourn_det as d";
 	$where = " WHERE f.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_facture_fourn = f.rowid";
-	$where.= " AND f.entity = ".$conf->entity;
+	$where .= " AND d.fk_facture_fourn = f.rowid";
+	$where .= " AND f.entity = ".$conf->entity;
 	$dateprint = 'f.datef';
-	$doc_number='f.ref';
-	$thirdTypeSelect='supplier';
+	$doc_number = 'f.ref';
+	$thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'supplier_proposal')
 {
     require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-    $documentstatic=new SupplierProposal($db);
+    $documentstatic = new SupplierProposal($db);
     $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
     $tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
     $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-    $where.= " AND d.fk_supplier_proposal = c.rowid";
-    $where.= " AND c.entity = ".$conf->entity;
+    $where .= " AND d.fk_supplier_proposal = c.rowid";
+    $where .= " AND c.entity = ".$conf->entity;
     $dateprint = 'c.date_valid';
-    $doc_number='c.ref';
-    $thirdTypeSelect='supplier';
+    $doc_number = 'c.ref';
+    $thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'supplier_order')
 { 	// Supplier : Show products from orders.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-	$documentstatic=new CommandeFournisseur($db);
+	$documentstatic = new CommandeFournisseur($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."commande_fournisseur as c,".MAIN_DB_PREFIX."commande_fournisseurdet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_commande = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_commande = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='supplier';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'supplier';
 }
 if ($type_element == 'contract')
 { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-	$documentstatic=new Contrat($db);
-	$documentstaticline=new ContratLigne($db);
+	$documentstatic = new Contrat($db);
+	$documentstaticline = new ContratLigne($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, ';
 	$tables_from = MAIN_DB_PREFIX."contrat as c,".MAIN_DB_PREFIX."contratdet as d";
 	$where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-	$where.= " AND d.fk_contrat = c.rowid";
-	$where.= " AND c.entity = ".$conf->entity;
+	$where .= " AND d.fk_contrat = c.rowid";
+	$where .= " AND c.entity = ".$conf->entity;
 	$dateprint = 'c.date_valid';
-	$doc_number='c.ref';
-	$thirdTypeSelect='customer';
+	$doc_number = 'c.ref';
+	$thirdTypeSelect = 'customer';
 }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect',$parameters);    // Note that $action and $object may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 
 if (!empty($sql_select))
 {
 	$sql = $sql_select;
-	$sql.= ' d.description as description,';
-	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'supplier_proposal') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'contract') $sql.= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element != 'fichinter') $sql.= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
-	$sql.= " s.rowid as socid ";
-	if ($type_element != 'fichinter') $sql.= ", p.ref as prod_ref, p.label as product_label";
-	$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
-	if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
-	$sql.= $where;
+	$sql .= ' d.description as description,';
+	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	if ($type_element == 'supplier_proposal') $sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	if ($type_element == 'contract') $sql .= ' d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	if ($type_element != 'fichinter') $sql .= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity,';
+	$sql .= " s.rowid as socid ";
+	if ($type_element != 'fichinter') $sql .= ", p.ref as prod_ref, p.label as product_label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".$tables_from;
+	if ($type_element != 'fichinter') $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
+	$sql .= $where;
 	if ($month > 0) {
 		if ($year > 0) {
 			$start = dol_mktime(0, 0, 0, $month, 1, $year);
-			$end = dol_time_plus_duree($start,1,'m') - 1;
-			$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
+			$end = dol_time_plus_duree($start, 1, 'm') - 1;
+			$sql .= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
 		} else {
-			$sql.= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d',$month)."'";
+			$sql .= " AND date_format(".$dateprint.", '%m') = '".sprintf('%02d', $month)."'";
 		}
 	} else if ($year > 0) {
 		$start = dol_mktime(0, 0, 0, 1, 1, $year);
-		$end = dol_time_plus_duree($start,1,'y') - 1;
-		$sql.= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
+		$end = dol_time_plus_duree($start, 1, 'y') - 1;
+		$sql .= " AND ".$dateprint." BETWEEN '".$db->idate($start)."' AND '".$db->idate($end)."'";
 	}
-	if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+	if ($sref) $sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	if ($sprod_fulldescr)
 	{
-	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
-	    $sql.=")";
+	    $sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    $sql .= ")";
 	}
-	$sql.= $db->order($sortfield,$sortorder);
+	$sql .= $db->order($sortfield, $sortorder);
 
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	$totalnboflines = $db->num_rows($resql);
 
-	$sql.= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 	//print $sql;
 }
 
-$disabled=0;
-$showempty=2;
-if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur)
+$disabled = 0;
+$showempty = 2;
+if (empty($elementTypeArray) && !$object->client && !$object->fournisseur)
 {
-    $showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
-    $disabled=1;
+    $showempty = $langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
+    $disabled = 1;
 }
 
 // Define type of elements
 $typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPOST('type_element'), $showempty, 0, 0, '', 0, 0, $disabled, '', 'maxwidth150onsmartphone');
 $button = '<input type="submit" class="button" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
-$param='';
-$param.="&sref=".urlencode($sref);
-$param.="&month=".urlencode($month);
-$param.="&year=".urlencode($year);
-$param.="&sprod_fulldescr=".urlencode($sprod_fulldescr);
-$param.="&socid=".urlencode($socid);
-$param.="&type_element=".urlencode($type_element);
+$param = '';
+$param .= "&sref=".urlencode($sref);
+$param .= "&month=".urlencode($month);
+$param .= "&year=".urlencode($year);
+$param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+$param .= "&socid=".urlencode($socid);
+$param .= "&type_element=".urlencode($type_element);
 
-$total_qty=0;
+$total_qty = 0;
 
 if ($sql_select)
 {
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if (!$resql) dol_print_error($db);
 
 	$num = $db->num_rows($resql);
 
-	$param="&socid=".$socid."&type_element=".$type_element;
-    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
-	if ($sprod_fulldescr) $param.= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
-	if ($sref) $param.= "&sref=".urlencode($sref);
-	if ($month) $param.= "&month=".$month;
-	if ($year) $param.= "&year=".$year;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+	$param = "&socid=".$socid."&type_element=".$type_element;
+    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+	if ($sref) $param .= "&sref=".urlencode($sref);
+	if ($month) $param .= "&month=".$month;
+	if ($year) $param .= "&year=".$year;
+	if ($optioncss != '') $param .= '&optioncss='.$optioncss;
 
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, $totalnboflines, '', 0, '', '', $limit);
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
     print '<div class="div-table-responsive-no-min">';
     print '<table class="liste" width="100%">'."\n";
@@ -386,8 +386,8 @@ 
     print '<input class="flat" type="text" name="sref" size="8" value="'.$sref.'">';
     print '</td>';
     print '<td class="liste_titre nowrap center">'; // date
-    print $formother->select_month($month?$month:-1, 'month', 1, 0, 'valignmiddle');
-    $formother->select_year($year?$year:-1,'year',1, 20, 1);
+    print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
+    $formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
     print '</td>';
     print '<td class="liste_titre" align="center">';
     print '</td>';
@@ -399,42 +399,42 @@ 
     print '<td class="liste_titre" align="center">';
     print '</td>';
     print '<td class="liste_titre" align="right">';
-    $searchpicto=$form->showFilterAndCheckAddButtons(0);
+    $searchpicto = $form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
     print '</td>';
     print '</tr>';
 
     // Titles with sort buttons
     print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref',$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Date',$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
-    print_liste_field_titre('Status',$_SERVER['PHP_SELF'],'fk_statut','',$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre('Product',$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('TotalHT',$_SERVER['PHP_SELF'],'total_ht','',$param,'align="right"',$sortfield,$sortorder);
-    print_liste_field_titre('UnitPrice',$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
+    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_statut', '', $param, 'align="center"', $sortfield, $sortorder);
+    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre('TotalHT', $_SERVER['PHP_SELF'], 'total_ht', '', $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre('UnitPrice', $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
     print "</tr>\n";
 
 
 	$i = 0;
 	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
 	{
-		$documentstatic->id=$objp->doc_id;
-		$documentstatic->ref=$objp->doc_number;
-		$documentstatic->type=$objp->doc_type;
-		$documentstatic->fk_statut=$objp->status;
-		$documentstatic->fk_status=$objp->status;
-		$documentstatic->statut=$objp->status;
-		$documentstatic->status=$objp->status;
-		$documentstatic->paye=$objp->paid;
+		$documentstatic->id = $objp->doc_id;
+		$documentstatic->ref = $objp->doc_number;
+		$documentstatic->type = $objp->doc_type;
+		$documentstatic->fk_statut = $objp->status;
+		$documentstatic->fk_status = $objp->status;
+		$documentstatic->statut = $objp->status;
+		$documentstatic->status = $objp->status;
+		$documentstatic->paye = $objp->paid;
 
-		if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;
+		if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status;
 
 		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
 		print $documentstatic->getNomUrl(1);
 		print '</td>';
-		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint),'day').'</td>';
+		print '<td align="center" width="80">'.dol_print_date($db->jdate($objp->dateprint), 'day').'</td>';
 
 		// Status
 		print '<td align="center">';
@@ -451,58 +451,58 @@ 
 		print '<td>';
 
 		// Define text, description and type
-		$text=''; $description=''; $type=0;
+		$text = ''; $description = ''; $type = 0;
 
 		// Code to show product duplicated from commonobject->printObjectLine
 		if ($objp->fk_product > 0)
 		{
 			$product_static = new Product($db);
 
-			$product_static->type=$objp->fk_product_type;
-			$product_static->id=$objp->fk_product;
-			$product_static->ref=$objp->ref;
-			$product_static->entity=$objp->pentity;
-			$text=$product_static->getNomUrl(1);
+			$product_static->type = $objp->fk_product_type;
+			$product_static->id = $objp->fk_product;
+			$product_static->ref = $objp->ref;
+			$product_static->entity = $objp->pentity;
+			$text = $product_static->getNomUrl(1);
 		}
 
 		// Product
 		if ($objp->fk_product > 0)
 		{
 			// Define output language
-			if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
+			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
 			{
 				$prod = new Product($db);
 				$prod->fetch($objp->fk_product);
 
 				$outputlangs = $langs;
-				$newlang='';
-				if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-				if (empty($newlang)) $newlang=$object->default_lang;
-				if (! empty($newlang))
+				$newlang = '';
+				if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if (empty($newlang)) $newlang = $object->default_lang;
+				if (!empty($newlang))
 				{
-					$outputlangs = new Translate("",$conf);
+					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
 
-				$label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
+				$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
 			}
 			else
 			{
 				$label = $objp->product_label;
 			}
 
-			$text.= ' - '.(! empty($objp->label)?$objp->label:$label);
-			$description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($objp->description));
+			$text .= ' - '.(!empty($objp->label) ? $objp->label : $label);
+			$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($objp->description));
 		}
 
 		if (($objp->info_bits & 2) == 2) { ?>
 			<a href="<?php echo DOL_URL_ROOT.'/comm/remx.php?id='.$object->id; ?>">
 			<?php
-			$txt='';
-			print img_object($langs->trans("ShowReduc"),'reduc').' ';
-			if ($objp->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-			elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+			$txt = '';
+			print img_object($langs->trans("ShowReduc"), 'reduc').' ';
+			if ($objp->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
+			elseif ($objp->description == '(EXCESS RECEIVED)') $txt = $langs->trans("ExcessReceived");
+			elseif ($objp->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			?>
@@ -512,33 +512,33 @@ 
 			{
 				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
+					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 				}
 				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
+					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
 				}
 				elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
+					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
 				}
 				elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
 				{
-					$discount=new DiscountAbsolute($db);
+					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
-					echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
+					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
-					if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
+					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
 				}
 				else
 				{
-					echo ($txt?' - ':'').dol_htmlentitiesbr($objp->description);
+					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
 			}
 		}
@@ -546,33 +546,33 @@ 
 		{
 			if ($objp->fk_product > 0) {
 
-				echo $form->textwithtooltip($text,$description,3,'','',$i,0,'');
+				echo $form->textwithtooltip($text, $description, 3, '', '', $i, 0, '');
 
 				// Show range
 				echo get_date_range($objp->date_start, $objp->date_end);
 
 				// Add description in form
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
+				if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 				{
-					print (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+					print (!empty($objp->description) && $objp->description != $objp->product_label) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 				}
 			} else {
 
-				if (! empty($objp->label) || ! empty($objp->description))
+				if (!empty($objp->label) || !empty($objp->description))
 				{
-					if ($type==1) $text = img_object($langs->trans('Service'),'service');
-					else $text = img_object($langs->trans('Product'),'product');
+					if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
+					else $text = img_object($langs->trans('Product'), 'product');
 
-					if (! empty($objp->label)) {
-						$text.= ' <strong>'.$objp->label.'</strong>';
-						echo $form->textwithtooltip($text,dol_htmlentitiesbr($objp->description),3,'','',$i,0,'');
+					if (!empty($objp->label)) {
+						$text .= ' <strong>'.$objp->label.'</strong>';
+						echo $form->textwithtooltip($text, dol_htmlentitiesbr($objp->description), 3, '', '', $i, 0, '');
 					} else {
 						echo $text.' '.dol_htmlentitiesbr($objp->description);
 					}
 				}
 
 				// Show range
-				echo get_date_range($objp->date_start,$objp->date_end);
+				echo get_date_range($objp->date_start, $objp->date_end);
 			}
 		}
 
@@ -599,43 +599,43 @@ 
 		//print '<td align="left">'.$prodreftxt.'</td>';
 
 		print '<td align="right">'.$objp->prod_qty.'</td>';
-		$total_qty+=$objp->prod_qty;
+		$total_qty += $objp->prod_qty;
 
 		print '<td align="right">'.price($objp->total_ht).'</td>';
-		$total_ht+=$objp->total_ht;
+		$total_ht += $objp->total_ht;
 
-		print '<td align="right">'.price($objp->total_ht/(empty($objp->prod_qty)?1:$objp->prod_qty)).'</td>';
+		print '<td align="right">'.price($objp->total_ht / (empty($objp->prod_qty) ? 1 : $objp->prod_qty)).'</td>';
 
 		print "</tr>\n";
 		$i++;
 	}
 
 	print '<tr class="liste_total">';
-	print '<td>' . $langs->trans('Total') . '</td>';
+	print '<td>'.$langs->trans('Total').'</td>';
 	print '<td colspan="3"></td>';
-	print '<td align="right">' . $total_qty . '</td>';
-	print '<td align="right">' . price($total_ht) . '</td>';
-	print '<td align="right">' . price($total_ht/(empty($total_qty)?1:$total_qty)) . '</td>';
+	print '<td align="right">'.$total_qty.'</td>';
+	print '<td align="right">'.price($total_ht).'</td>';
+	print '<td align="right">'.price($total_ht / (empty($total_qty) ? 1 : $total_qty)).'</td>';
 	print "</table>";
 	print '</div>';
 
 	if ($num > $limit) {
-		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num);
+		print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
 	}
 	$db->free($resql);
 }
 else if (empty($type_element) || $type_element == -1)
 {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste" width="100%">'."\n";
     // Titles with sort buttons
     print '<tr class="liste_titre">';
-    print_liste_field_titre('Ref',$_SERVER['PHP_SELF'],'doc_number','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Date',$_SERVER['PHP_SELF'],'dateprint','',$param,'align="center" width="150"',$sortfield,$sortorder);
-    print_liste_field_titre('Status',$_SERVER['PHP_SELF'],'fk_status','',$param,'align="center"',$sortfield,$sortorder);
-    print_liste_field_titre('Product',$_SERVER['PHP_SELF'],'','',$param,'align="left"',$sortfield,$sortorder);
-    print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('Ref', $_SERVER['PHP_SELF'], 'doc_number', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Date', $_SERVER['PHP_SELF'], 'dateprint', '', $param, 'align="center" width="150"', $sortfield, $sortorder);
+    print_liste_field_titre('Status', $_SERVER['PHP_SELF'], 'fk_status', '', $param, 'align="center"', $sortfield, $sortorder);
+    print_liste_field_titre('Product', $_SERVER['PHP_SELF'], '', '', $param, 'align="left"', $sortfield, $sortorder);
+    print_liste_field_titre('Quantity', $_SERVER['PHP_SELF'], 'prod_qty', '', $param, 'align="right"', $sortfield, $sortorder);
     print "</tr>\n";
 
 	print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
@@ -643,7 +643,7 @@ 
 	print "</table>";
 }
 else {
-    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num, '', '');
+    print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, '', '');
 
     print '<table class="liste" width="100%">'."\n";
 

dolibarr/htdocs/societe/document.php

Indentation +61 added lines, -61 removed lines

@@ -42,8 +42,8 @@ 
 // Security check
 if ($user->societe_id > 0)
 {
-	unset($action);
-	$socid = $user->societe_id;
+    unset($action);
+    $socid = $user->societe_id;
 }
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
@@ -61,10 +61,10 @@ 
 $object = new Societe($db);
 if ($id > 0 || ! empty($ref))
 {
-	$result = $object->fetch($id, $ref);
+    $result = $object->fetch($id, $ref);
 
-	$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
-	$courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id,0,0,0,$object,'thirdparty');
+    $upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
+    $courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id,0,0,0,$object,'thirdparty');
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -92,24 +92,24 @@ 
 
 if ($object->id)
 {
-	/*
+    /*
 	 * Show tabs
 	 */
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
-	$head = societe_prepare_head($object);
+    if (! empty($conf->notification->enabled)) $langs->load("mails");
+    $head = societe_prepare_head($object);
 
-	$form=new Form($db);
+    $form=new Form($db);
 
-	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
+    dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
-	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
-	{
-		$totalsize+=$file['size'];
-	}
+    // Build file list
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
@@ -118,53 +118,53 @@ 
     print '<div class="fichecenter">';
 
     print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent">';
-
-	// Prefix
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
-		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-	}
-
-	if ($object->client)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-		print '</td></tr>';
-	}
-
-	if ($object->fournisseur)
-	{
-		print '<tr><td class="titlefield">';
-		print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-		print '</td></tr>';
-	}
-
-	// Number of files
-	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-
-	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
-
-	print '</table>';
-
-	print '</div>';
-
-	dol_fiche_end();
-
-	$modulepart = 'societe';
-	$permission = $user->rights->societe->creer;
-	$permtoedit = $user->rights->societe->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+    print '<table class="border centpercent">';
+
+    // Prefix
+    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    {
+        print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+    }
+
+    if ($object->client)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('CustomerCode').'</td><td colspan="3">';
+        print $object->code_client;
+        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        print '</td></tr>';
+    }
+
+    if ($object->fournisseur)
+    {
+        print '<tr><td class="titlefield">';
+        print $langs->trans('SupplierCode').'</td><td colspan="3">';
+        print $object->code_fournisseur;
+        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        print '</td></tr>';
+    }
+
+    // Number of files
+    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+    // Total size
+    print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+
+    print '</table>';
+
+    print '</div>';
+
+    dol_fiche_end();
+
+    $modulepart = 'societe';
+    $permission = $user->rights->societe->creer;
+    $permtoedit = $user->rights->societe->creer;
+    $param = '&id=' . $object->id;
+    include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
-	accessforbidden('',0,0);
+    accessforbidden('',0,0);
 }
 
 // End of page

Braces +22 added lines, -9 removed lines

@@ -55,8 +55,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position_name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="position_name";
+}
 
 $object = new Societe($db);
 if ($id > 0 || ! empty($ref))
@@ -86,7 +90,9 @@ 
 $form = new Form($db);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Files");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Files");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -95,7 +101,9 @@ 
 	/*
 	 * Show tabs
 	 */
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (! empty($conf->notification->enabled)) {
+	    $langs->load("mails");
+	}
 	$head = societe_prepare_head($object);
 
 	$form=new Form($db);
@@ -121,17 +129,21 @@ 
 	print '<table class="border centpercent">';
 
 	// Prefix
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+	    // Old not used prefix field
 	{
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
+	}
 
 	if ($object->client)
 	{
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		if ($object->check_codeclient() <> 0) {
+		    print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
@@ -140,7 +152,9 @@ 
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
 		print $object->code_fournisseur;
-		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		if ($object->check_codefournisseur() <> 0) {
+		    print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
 		print '</td></tr>';
 	}
 
@@ -161,8 +175,7 @@ 
 	$permtoedit = $user->rights->societe->creer;
 	$param = '&id=' . $object->id;
 	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	accessforbidden('',0,0);
 }

Spacing +30 added lines, -30 removed lines

@@ -29,7 +29,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -38,9 +38,9 @@ 
 
 $langs->loadLangs(array("companies", "other"));
 
-$action=GETPOST('action','aZ09');
-$confirm=GETPOST('confirm');
-$id=(GETPOST('socid','int') ? GETPOST('socid','int') : GETPOST('id','int'));
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
@@ -52,27 +52,27 @@ 
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 // Get parameters
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$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 = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="position_name";
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "position_name";
 
 $object = new Societe($db);
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$result = $object->fetch($id, $ref);
 
-	$upload_dir = $conf->societe->multidir_output[$object->entity] . "/" . $object->id ;
-	$courrier_dir = $conf->societe->multidir_output[$object->entity] . "/courrier/" . get_exdir($object->id,0,0,0,$object,'thirdparty');
+	$upload_dir = $conf->societe->multidir_output[$object->entity]."/".$object->id;
+	$courrier_dir = $conf->societe->multidir_output[$object->entity]."/courrier/".get_exdir($object->id, 0, 0, 0, $object, 'thirdparty');
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('thirdpartydocument','globalcard'));
+$hookmanager->initHooks(array('thirdpartydocument', 'globalcard'));
 
 
 
@@ -80,7 +80,7 @@ 
  * Actions
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 
 /*
@@ -89,35 +89,35 @@ 
 
 $form = new Form($db);
 
-$title=$langs->trans("ThirdParty").' - '.$langs->trans("Files");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
-$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('',$title,$help_url);
+$title = $langs->trans("ThirdParty").' - '.$langs->trans("Files");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Files");
+$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
 
 if ($object->id)
 {
 	/*
 	 * Show tabs
 	 */
-	if (! empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
 	$head = societe_prepare_head($object);
 
-	$form=new Form($db);
+	$form = new Form($db);
 
 	dol_fiche_head($head, 'document', $langs->trans("ThirdParty"), -1, 'company');
 
 
 	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file)
 	{
-		$totalsize+=$file['size'];
+		$totalsize += $file['size'];
 	}
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
+    dol_banner_tab($object, 'socid', $linkback, ($user->societe_id ? 0 : 1), 'rowid', 'nom');
 
     print '<div class="fichecenter">';
 
@@ -125,7 +125,7 @@ 
 	print '<table class="border centpercent">';
 
 	// Prefix
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 	{
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
@@ -152,7 +152,7 @@ 
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 
 	// Total size
-	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 
 	print '</table>';
 
@@ -163,12 +163,12 @@ 
 	$modulepart = 'societe';
 	$permission = $user->rights->societe->creer;
 	$permtoedit = $user->rights->societe->creer;
-	$param = '&id=' . $object->id;
-	include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
+	$param = '&id='.$object->id;
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 }
 else
 {
-	accessforbidden('',0,0);
+	accessforbidden('', 0, 0);
 }
 
 // End of page