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

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

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

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

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

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
 {

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

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

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