Dolibarr / dolibarr

htdocs/api/class/api_documents.class.php

Indentation +174 added lines, -174 removed lines

@@ -33,49 +33,49 @@ 
 class Documents extends DolibarrApi
 {
 
-    /**
-     * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $DOCUMENT_FIELDS = array(
-        'modulepart'
-    );
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-
-    /**
-     * Returns a document. Note that, this API is similar to using the wrapper link "documents.php" to download
-     * a file (used for internal HTML links of documents into application), but with no need to be into a logged session (no need to post the session cookie).
-     *
-     * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
-     * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
-     * @param	int		$regeneratedoc	If requested document is the main document of an object, setting this to 1 ask API to regenerate document before returning it (supported for some module_part only). It is no effect in other cases.
-     * 									Also, note that setting this to 1 nead write access on object.
-     * @return  array                   List of documents
-     *
-     * @throws 500
-     * @throws 501
-     * @throws 400
-     * @throws 401
-     * @throws 200
-     */
-    public function index($module_part, $original_file='', $regeneratedoc=0)
-    {
+	/**
+	 * @var array   $DOCUMENT_FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $DOCUMENT_FIELDS = array(
+		'modulepart'
+	);
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
+
+
+	/**
+	 * Returns a document. Note that, this API is similar to using the wrapper link "documents.php" to download
+	 * a file (used for internal HTML links of documents into application), but with no need to be into a logged session (no need to post the session cookie).
+	 *
+	 * @param   string  $module_part    Name of module or area concerned by file download ('facture', ...)
+	 * @param   string  $original_file  Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf)
+	 * @param	int		$regeneratedoc	If requested document is the main document of an object, setting this to 1 ask API to regenerate document before returning it (supported for some module_part only). It is no effect in other cases.
+	 * 									Also, note that setting this to 1 nead write access on object.
+	 * @return  array                   List of documents
+	 *
+	 * @throws 500
+	 * @throws 501
+	 * @throws 400
+	 * @throws 401
+	 * @throws 200
+	 */
+	public function index($module_part, $original_file='', $regeneratedoc=0)
+	{
 		global $conf;
 
 		if (empty($module_part)) {
-	            throw new RestException(400, 'bad value for parameter modulepart');
+				throw new RestException(400, 'bad value for parameter modulepart');
+		}
+		if (empty($original_file)) {
+			throw new RestException(400, 'bad value for parameter ref or subdir');
 		}
-        if (empty($original_file)) {
-            throw new RestException(400, 'bad value for parameter ref or subdir');
-        }
 
 		//--- Finds and returns the document
 		$entity=$conf->entity;
@@ -87,94 +87,94 @@ 
 
 		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
 		{
-		    throw new RestException(401);
+			throw new RestException(401);
+		}
+		if (!$accessallowed) {
+			throw new RestException(401);
+		}
+
+		// --- Generates the document
+		if ($regeneratedoc)
+		{
+			$hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1;
+			$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
+			$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
+
+			if ($module_part == 'facture' || $module_part == 'invoice')
+			{
+				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+				$this->invoice = new Facture($this->db);
+				$result = $this->invoice->fetch(0, $ref);
+				if( ! $result ) {
+					throw new RestException(404, 'Invoice not found');
+				}
+				$result = $this->invoice->generateDocument($this->invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if( $result <= 0 ) {
+					throw new RestException(500, 'Error generating document');
+				}
+			}
 		}
-	    if (!$accessallowed) {
-	        throw new RestException(401);
-	    }
-
-        // --- Generates the document
-        if ($regeneratedoc)
-        {
-        	$hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1;
-        	$hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1;
-        	$hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1;
-
-        	if ($module_part == 'facture' || $module_part == 'invoice')
-        	{
-        		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        		$this->invoice = new Facture($this->db);
-        		$result = $this->invoice->fetch(0, $ref);
-        		if( ! $result ) {
-        			throw new RestException(404, 'Invoice not found');
-        		}
-        		$result = $this->invoice->generateDocument($this->invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        		if( $result <= 0 ) {
-        			throw new RestException(500, 'Error generating document');
-        		}
-        	}
-        }
 
 		$filename = basename($original_file);
 		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
 
 		if (! file_exists($original_file_osencoded))
 		{
-		    throw new RestException(404, 'File not found');
+			throw new RestException(404, 'File not found');
 		}
 
 		$file_content=file_get_contents($original_file_osencoded);
-        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
-    }
-
-
-    /**
-     * Return a document.
-     *
-     * @param   int         $id          ID of document
-     * @return  array                    Array with data of file
-     *
-     * @throws RestException
-     */
-    /*
+		return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
+	}
+
+
+	/**
+	 * Return a document.
+	 *
+	 * @param   int         $id          ID of document
+	 * @return  array                    Array with data of file
+	 *
+	 * @throws RestException
+	 */
+	/*
     public function get($id) {
         return array('note'=>'xxx');
     }*/
 
 
-    /**
-     * Push a file.
-     * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
-     * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
-     *
-     * @param   string  $filename           Name of file to create ('FA1705-0123')
-     * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
-     * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
-     * @param   string  $subdir             Subdirectory (Only if ref not provided)
-     * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
-     * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
-     * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
-     * @return  bool     				    State of copy
-     * @throws RestException
-     */
-    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
-    {
-        global $db, $conf;
-
-        /*var_dump($modulepart);
+	/**
+	 * Push a file.
+	 * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }.
+	 *
+	 * @param   string  $filename           Name of file to create ('FA1705-0123')
+	 * @param   string  $modulepart         Name of module or area concerned by file upload ('facture', ...)
+	 * @param   string  $ref                Reference of object (This will define subdir automatically and store submited file into it)
+	 * @param   string  $subdir             Subdirectory (Only if ref not provided)
+	 * @param   string  $filecontent        File content (string with file content. An empty file will be created if this parameter is not provided)
+	 * @param   string  $fileencoding       File encoding (''=no encoding, 'base64'=Base 64)
+	 * @param   int 	$overwriteifexists  Overwrite file if exists (1 by default)
+	 * @return  bool     				    State of copy
+	 * @throws RestException
+	 */
+	public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+	{
+		global $db, $conf;
+
+		/*var_dump($modulepart);
         var_dump($filename);
         var_dump($filecontent);
         exit;*/
 
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
 
-        if (!DolibarrApiAccess::$user->rights->ecm->upload) {
-            throw new RestException(401);
-        }
+		if (!DolibarrApiAccess::$user->rights->ecm->upload) {
+			throw new RestException(401);
+		}
 
-        $newfilecontent = '';
-        if (empty($fileencoding)) $newfilecontent = $filecontent;
-        if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
+		$newfilecontent = '';
+		if (empty($fileencoding)) $newfilecontent = $filecontent;
+		if ($fileencoding == 'base64') $newfilecontent = base64_decode($filecontent);
 
 		$original_file = dol_sanitizeFileName($filename);
 
@@ -183,37 +183,37 @@ 
 		$entity = $user->entity;
 		if ($ref)
 		{
-    		if ($modulepart == 'facture' || $modulepart == 'invoice')
-    		{
-    		    $modulepart='facture';
-    		    $object=new Facture($db);
-    		    $result = $object->fetch('', $ref);
-    		}
-
-    		if (! ($object->id > 0))
-    		{
-   		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
-    		}
-
-    		$tmp = dol_check_secure_access_document($modulepart, $tmpreldir.$object->ref, $entity, DolibarrApiAccess::$user, $ref, 'write');
-    		$upload_dir = $tmp['original_file'];
-
-    		if (empty($upload_dir) || $upload_dir == '/')
-    		{
-    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
-    		}
+			if ($modulepart == 'facture' || $modulepart == 'invoice')
+			{
+				$modulepart='facture';
+				$object=new Facture($db);
+				$result = $object->fetch('', $ref);
+			}
+
+			if (! ($object->id > 0))
+			{
+   				throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
+			}
+
+			$tmp = dol_check_secure_access_document($modulepart, $tmpreldir.$object->ref, $entity, DolibarrApiAccess::$user, $ref, 'write');
+			$upload_dir = $tmp['original_file'];
+
+			if (empty($upload_dir) || $upload_dir == '/')
+			{
+				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+			}
 		}
 		else
 		{
-		    if ($modulepart == 'invoice') $modulepart ='facture';
+			if ($modulepart == 'invoice') $modulepart ='facture';
 
-		    $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
-    		$upload_dir = $tmp['original_file'];
+			$tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
+			$upload_dir = $tmp['original_file'];
 
-		    if (empty($upload_dir) || $upload_dir == '/')
-    		{
-    		    throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
-    		}
+			if (empty($upload_dir) || $upload_dir == '/')
+			{
+				throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.');
+			}
 		}
 
 
@@ -223,46 +223,46 @@ 
 		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
 		dol_delete_file($destfiletmp);
 
-        if (!dol_is_dir($upload_dir)) {
-            throw new RestException(401,'Directory not exists : '.$upload_dir);
-        }
-
-        if (! $overwriteifexists && dol_is_file($destfile))
-        {
-            throw new RestException(500, "File with name '".$original_file."' already exists.");
-        }
-
-        $fhandle = @fopen($destfiletmp, 'w');
-        if ($fhandle)
-        {
-            $nbofbyteswrote = fwrite($fhandle, $newfilecontent);
-            fclose($fhandle);
-            @chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-        }
-        else
-        {
-            throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
-        }
-
-        $result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
-
-        return $result;
-    }
-
-    /**
-     * Validate fields before create or update object
-     *
-     * @param   array           $data   Array with data to verify
-     * @return  array
-     * @throws  RestException
-     */
-    function _validate_file($data) {
-        $result = array();
-        foreach (Documents::$DOCUMENT_FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $result[$field] = $data[$field];
-        }
-        return $result;
-    }
+		if (!dol_is_dir($upload_dir)) {
+			throw new RestException(401,'Directory not exists : '.$upload_dir);
+		}
+
+		if (! $overwriteifexists && dol_is_file($destfile))
+		{
+			throw new RestException(500, "File with name '".$original_file."' already exists.");
+		}
+
+		$fhandle = @fopen($destfiletmp, 'w');
+		if ($fhandle)
+		{
+			$nbofbyteswrote = fwrite($fhandle, $newfilecontent);
+			fclose($fhandle);
+			@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
+		}
+		else
+		{
+			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
+		}
+
+		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
+
+		return $result;
+	}
+
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	function _validate_file($data) {
+		$result = array();
+		foreach (Documents::$DOCUMENT_FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$result[$field] = $data[$field];
+		}
+		return $result;
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -66,7 +66,7 @@ 
      * @throws 401
      * @throws 200
      */
-    public function index($module_part, $original_file='', $regeneratedoc=0)
+    public function index($module_part, $original_file = '', $regeneratedoc = 0)
     {
 		global $conf;
 
@@ -78,14 +78,14 @@ 
         }
 
 		//--- Finds and returns the document
-		$entity=$conf->entity;
+		$entity = $conf->entity;
 
 		$check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', ($regeneratedoc ? 'write' : 'read'));
 		$accessallowed              = $check_access['accessallowed'];
 		$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 		$original_file              = $check_access['original_file'];
 
-		if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file))
+		if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file))
 		{
 		    throw new RestException(401);
 		}
@@ -105,26 +105,26 @@ 
         		require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
         		$this->invoice = new Facture($this->db);
         		$result = $this->invoice->fetch(0, $ref);
-        		if( ! $result ) {
+        		if (!$result) {
         			throw new RestException(404, 'Invoice not found');
         		}
         		$result = $this->invoice->generateDocument($this->invoice->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-        		if( $result <= 0 ) {
+        		if ($result <= 0) {
         			throw new RestException(500, 'Error generating document');
         		}
         	}
         }
 
 		$filename = basename($original_file);
-		$original_file_osencoded=dol_osencode($original_file);	// New file name encoded in OS encoding charset
+		$original_file_osencoded = dol_osencode($original_file); // New file name encoded in OS encoding charset
 
-		if (! file_exists($original_file_osencoded))
+		if (!file_exists($original_file_osencoded))
 		{
 		    throw new RestException(404, 'File not found');
 		}
 
-		$file_content=file_get_contents($original_file_osencoded);
-        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' );
+		$file_content = file_get_contents($original_file_osencoded);
+        return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)');
     }
 
 
@@ -157,7 +157,7 @@ 
      * @return  bool     				    State of copy
      * @throws RestException
      */
-    public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0)
+    public function post($filename, $modulepart, $ref = '', $subdir = '', $filecontent = '', $fileencoding = '', $overwriteifexists = 0)
     {
         global $db, $conf;
 
@@ -166,7 +166,7 @@ 
         var_dump($filecontent);
         exit;*/
 
-        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
         if (!DolibarrApiAccess::$user->rights->ecm->upload) {
             throw new RestException(401);
@@ -185,12 +185,12 @@ 
 		{
     		if ($modulepart == 'facture' || $modulepart == 'invoice')
     		{
-    		    $modulepart='facture';
-    		    $object=new Facture($db);
+    		    $modulepart = 'facture';
+    		    $object = new Facture($db);
     		    $result = $object->fetch('', $ref);
     		}
 
-    		if (! ($object->id > 0))
+    		if (!($object->id > 0))
     		{
    		        throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found.");
     		}
@@ -205,7 +205,7 @@ 
 		}
 		else
 		{
-		    if ($modulepart == 'invoice') $modulepart ='facture';
+		    if ($modulepart == 'invoice') $modulepart = 'facture';
 
 		    $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write');
     		$upload_dir = $tmp['original_file'];
@@ -219,15 +219,15 @@ 
 
 		$upload_dir = dol_sanitizePathName($upload_dir);
 
-		$destfile = $upload_dir . '/' . $original_file;
-		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file;
+		$destfile = $upload_dir.'/'.$original_file;
+		$destfiletmp = DOL_DATA_ROOT.'/admin/temp/'.$original_file;
 		dol_delete_file($destfiletmp);
 
         if (!dol_is_dir($upload_dir)) {
-            throw new RestException(401,'Directory not exists : '.$upload_dir);
+            throw new RestException(401, 'Directory not exists : '.$upload_dir);
         }
 
-        if (! $overwriteifexists && dol_is_file($destfile))
+        if (!$overwriteifexists && dol_is_file($destfile))
         {
             throw new RestException(500, "File with name '".$original_file."' already exists.");
         }

htdocs/accountancy/customer/index.php

Spacing +132 added lines, -132 removed lines

@@ -27,9 +27,9 @@ 
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Langs
 $langs->load("compta");
@@ -44,11 +44,11 @@ 
 }
 if ($user->societe_id > 0)
 	accessforbidden();
-if (! $user->rights->accounting->bind->write)
+if (!$user->rights->accounting->bind->write)
 	accessforbidden();
 
 // Filter
-$year = GETPOST("year",'int');
+$year = GETPOST("year", 'int');
 if ($year == 0) {
 	$year_current = strftime("%Y", time());
 	$year_start = $year_current;
@@ -58,7 +58,7 @@ 
 }
 
 // Validate History
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 
 
@@ -72,27 +72,27 @@ 
 	$db->begin();
 
 	// First clean corrupted data
-	$sqlclean = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
+	$sqlclean = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd";
 	$sqlclean .= " SET fk_code_ventilation = 0";
 	$sqlclean .= ' WHERE fd.fk_code_ventilation NOT IN ';
 	$sqlclean .= '	(SELECT accnt.rowid ';
-	$sqlclean .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
-	$sqlclean .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
-	$sqlclean .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+	$sqlclean .= '	FROM '.MAIN_DB_PREFIX.'accounting_account as accnt';
+	$sqlclean .= '	INNER JOIN '.MAIN_DB_PREFIX.'accounting_system as syst';
+	$sqlclean .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.')';
 	$resql = $db->query($sqlclean);
 
 	// Now make the binding. Bind automatically only for product with a dedicated account that exists into chart of account, others need a manual bind
 	if ($db->type == 'pgsql') {
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet";
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " FROM " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
-		$sql1 .= " WHERE " . MAIN_DB_PREFIX . "facturedet.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
+		$sql1 .= " FROM ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."accounting_account as accnt , ".MAIN_DB_PREFIX."accounting_system as syst";
+		$sql1 .= " WHERE ".MAIN_DB_PREFIX."facturedet.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=".$conf->global->CHARTOFACCOUNTS;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
-		$sql1 .= " AND " . MAIN_DB_PREFIX . "facturedet.fk_code_ventilation = 0";
+		$sql1 .= " AND ".MAIN_DB_PREFIX."facturedet.fk_code_ventilation = 0";
 	} else {
-		$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd, " . MAIN_DB_PREFIX . "product as p, " . MAIN_DB_PREFIX . "accounting_account as accnt , " . MAIN_DB_PREFIX . "accounting_system as syst";
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd, ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."accounting_account as accnt , ".MAIN_DB_PREFIX."accounting_system as syst";
 		$sql1 .= " SET fk_code_ventilation = accnt.rowid";
-		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=" . $conf->global->CHARTOFACCOUNTS;
+		$sql1 .= " WHERE fd.fk_product = p.rowid  AND accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=".$conf->global->CHARTOFACCOUNTS;
 		$sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number";
 		$sql1 .= " AND fd.fk_code_ventilation = 0";
 	}
@@ -100,8 +100,8 @@ 
 	dol_syslog('htdocs/accountancy/customer/index.php');
 
 	$resql1 = $db->query($sql1);
-	if (! $resql1) {
-		$error ++;
+	if (!$resql1) {
+		$error++;
 		$db->rollback();
 		setEventMessages($db->lasterror(), null, 'errors');
 	} else {
@@ -113,19 +113,19 @@ 
 	$db->begin();
 
 	// Now clean
-	$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sql1.= " SET fk_code_ventilation = 0";
-	$sql1.= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM " . MAIN_DB_PREFIX . "facture as f";
-	$sql1.= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($year_current, 1, false)) . "'";
-	$sql1.= " AND f.datef <= '" . $db->idate(dol_get_last_day($year_current, 12, false)) . "'";
-	$sql1.= " AND f.entity IN (" . getEntity('accountancy') . ")";
-	$sql1.=")";
+	$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd";
+	$sql1 .= " SET fk_code_ventilation = 0";
+	$sql1 .= " WHERE fd.fk_facture IN ( SELECT f.rowid FROM ".MAIN_DB_PREFIX."facture as f";
+	$sql1 .= " WHERE f.datef >= '".$db->idate(dol_get_first_day($year_current, 1, false))."'";
+	$sql1 .= " AND f.datef <= '".$db->idate(dol_get_last_day($year_current, 12, false))."'";
+	$sql1 .= " AND f.entity IN (".getEntity('accountancy').")";
+	$sql1 .= ")";
 
 	dol_syslog("htdocs/accountancy/customer/index.php cleanaccountancycode", LOG_DEBUG);
 
 	$resql1 = $db->query($sql1);
-	if (! $resql1) {
-		$error ++;
+	if (!$resql1) {
+		$error++;
 		$db->rollback();
 		setEventMessage($db->lasterror(), 'errors');
 	} else {
@@ -141,24 +141,24 @@ 
 
 llxHeader('', $langs->trans("CustomersVentilation"));
 
-$textprevyear = '<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current - 1) . '">' . img_previous() . '</a>';
-$textnextyear = '&nbsp;<a href="' . $_SERVER["PHP_SELF"] . '?year=' . ($year_current + 1) . '">' . img_next() . '</a>';
+$textprevyear = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current - 1).'">'.img_previous().'</a>';
+$textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_current + 1).'">'.img_next().'</a>';
 
-print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, '', 'title_accountancy');
+print load_fiche_titre($langs->trans("CustomersVentilation")." ".$textprevyear." ".$langs->trans("Year")." ".$year_start." ".$textnextyear, '', 'title_accountancy');
 
 // Clean database
 $db->begin();
-$sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd";
+$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd";
 $sql1 .= " SET fk_code_ventilation = 0";
 $sql1 .= ' WHERE fd.fk_code_ventilation NOT IN ';
 $sql1 .= '	(SELECT accnt.rowid ';
-$sql1 .= '	FROM ' . MAIN_DB_PREFIX . 'accounting_account as accnt';
-$sql1 .= '	INNER JOIN ' . MAIN_DB_PREFIX . 'accounting_system as syst';
-$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid=' . $conf->global->CHARTOFACCOUNTS . ')';
+$sql1 .= '	FROM '.MAIN_DB_PREFIX.'accounting_account as accnt';
+$sql1 .= '	INNER JOIN '.MAIN_DB_PREFIX.'accounting_system as syst';
+$sql1 .= '	ON accnt.fk_pcg_version = syst.pcg_version AND syst.rowid='.$conf->global->CHARTOFACCOUNTS.')';
 dol_syslog("htdocs/accountancy/customer/index.php fixaccountancycode", LOG_DEBUG);
 $resql1 = $db->query($sql1);
-if (! $resql1) {
-	$error ++;
+if (!$resql1) {
+	$error++;
 	$db->rollback();
 	setEventMessage($db->lasterror(), 'errors');
 } else {
@@ -166,21 +166,21 @@ 
 }
 // End clean database
 
-print $langs->trans("DescVentilCustomer") . '<br>';
-print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")) . '<br>';
+print $langs->trans("DescVentilCustomer").'<br>';
+print $langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
 print '<br>';
 
-$sql = "SELECT count(*) FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-$sql .= " , " . MAIN_DB_PREFIX . "facture as f";
+$sql = "SELECT count(*) FROM ".MAIN_DB_PREFIX."facturedet as fd";
+$sql .= " , ".MAIN_DB_PREFIX."facture as f";
 $sql .= " WHERE fd.fk_code_ventilation = 0";
 $sql .= " AND f.rowid = fd.fk_facture";
 $sql .= " AND f.fk_statut > 0";
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";	// We don't share object for accountancy
+$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // We don't share object for accountancy
 
 dol_syslog('htdocs/accountancy/customer/index.php');
 $result = $db->query($sql);
@@ -192,47 +192,47 @@ 
 
 $y = $year_current;
 
-$buttonbind = '<a class="butAction" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=validatehistory">' . $langs->trans("ValidateHistory") . '</a>';
-$buttonreset = '<a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?year=' . $year_current . '&action=cleanaccountancycode">' . $langs->trans("CleanHistory", $year_current) . '</a>';
+$buttonbind = '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?year='.$year_current.'&action=validatehistory">'.$langs->trans("ValidateHistory").'</a>';
+$buttonreset = '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?year='.$year_current.'&action=cleanaccountancycode">'.$langs->trans("CleanHistory", $year_current).'</a>';
 
 
 print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
-print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
-for($i = 1; $i <= 12; $i ++) {
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>';
+print '<td width="200" align="left">'.$langs->trans("Label").'</td>';
+for ($i = 1; $i <= 12; $i++) {
+	print '<td width="60" align="right">'.$langs->trans('MonthShort'.str_pad($i, 2, '0', STR_PAD_LEFT)).'</td>';
 }
-print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
+print '<td width="60" align="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-$sql = "SELECT " . $db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') . " AS codecomptable,";
-$sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
-for($i = 1; $i <= 12; $i ++) {
-	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
+$sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
+for ($i = 1; $i <= 12; $i++) {
+	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$i, 'fd.total_ht', '0').") AS month".str_pad($i, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
-$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
+$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
+$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " WHERE f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+$sql .= "  AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 $sql .= " GROUP BY fd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog('htdocs/accountancy/customer/index.php sql=' . $sql, LOG_DEBUG);
+dol_syslog('htdocs/accountancy/customer/index.php sql='.$sql, LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
 
-	while ( $row = $db->fetch_row($resql)) {
+	while ($row = $db->fetch_row($resql)) {
 
 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
@@ -248,11 +248,11 @@ 
 		}
 		else print $row[1];
 		print '</td>';
-		for($i = 2; $i <= 12; $i ++) {
-			print '<td align="right">' . price($row[$i]) . '</td>';
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td align="right">'.price($row[$i]).'</td>';
 		}
-		print '<td align="right">' . price($row[13]) . '</td>';
-		print '<td align="right"><b>' . price($row[14]) . '</b></td>';
+		print '<td align="right">'.price($row[13]).'</td>';
+		print '<td align="right"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -269,29 +269,29 @@ 
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td width="200">' . $langs->trans("Account") . '</td>';
-print '<td width="200" align="left">' . $langs->trans("Label") . '</td>';
-for($i = 1; $i <= 12; $i ++) {
-	print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>';
+print '<td width="200" align="left">'.$langs->trans("Label").'</td>';
+for ($i = 1; $i <= 12; $i++) {
+	print '<td width="60" align="right">'.$langs->trans('MonthShort'.str_pad($i, 2, '0', STR_PAD_LEFT)).'</td>';
 }
-print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
+print '<td width="60" align="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-$sql = "SELECT " . $db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number') . " AS codecomptable,";
-$sql .= "  " . $db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label') . " AS intitule,";
-for($i = 1; $i <= 12; $i ++) {
-	$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+$sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account_number')." AS codecomptable,";
+$sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
+for ($i = 1; $i <= 12; $i++) {
+	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$i, 'fd.total_ht', '0').") AS month".str_pad($i, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
-$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
+$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " WHERE f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+$sql .= "  AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // We don't share object for accountancy
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY fd.fk_code_ventilation,aa.account_number,aa.label";
@@ -301,7 +301,7 @@ 
 if ($resql) {
 	$num = $db->num_rows($resql);
 
-	while ( $row = $db->fetch_row($resql)) {
+	while ($row = $db->fetch_row($resql)) {
 
 		print '<tr class="oddeven"><td>';
 		if ($row[0] == 'tobind')
@@ -319,11 +319,11 @@ 
 		else print $row[1];
 		print '</td>';
 
-		for($i = 2; $i <= 12; $i ++) {
-			print '<td align="right">' . price($row[$i]) . '</td>';
+		for ($i = 2; $i <= 12; $i++) {
+			print '<td align="right">'.price($row[$i]).'</td>';
 		}
-		print '<td align="right">' . price($row[13]) . '</td>';
-		print '<td align="right"><b>' . price($row[14]) . '</b></td>';
+		print '<td align="right">'.price($row[13]).'</td>';
+		print '<td align="right"><b>'.price($row[14]).'</b></td>';
 		print '</tr>';
 	}
 	$db->free($resql);
@@ -344,26 +344,26 @@ 
 	print "<br>\n";
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td width="400" align="left">' . $langs->trans("TotalVente") . '</td>';
-	for($i = 1; $i <= 12; $i ++) {
-		print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+	print '<tr class="liste_titre"><td width="400" align="left">'.$langs->trans("TotalVente").'</td>';
+	for ($i = 1; $i <= 12; $i++) {
+		print '<td width="60" align="right">'.$langs->trans('MonthShort'.str_pad($i, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
-	print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
+	print '<td width="60" align="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-	$sql = "SELECT '" . $langs->trans("TotalVente") . "' AS total,";
-	for($i = 1; $i <= 12; $i ++) {
-		$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, 'fd.total_ht', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+	$sql = "SELECT '".$langs->trans("TotalVente")."' AS total,";
+	for ($i = 1; $i <= 12; $i++) {
+		$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$i, 'fd.total_ht', '0').") AS month".str_pad($i, 2, '0', STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-	$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-	$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
-	$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-	$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")"; // We don't share object for accountancy
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-		$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+	$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
+	$sql .= " WHERE f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+	$sql .= "  AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+	$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // We don't share object for accountancy
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 	} else {
-		$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+		$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 	}
 
 	dol_syslog('htdocs/accountancy/customer/index.php');
@@ -372,11 +372,11 @@ 
 		$num = $db->num_rows($resql);
 
 		while ($row = $db->fetch_row($resql)) {
-			print '<tr><td>' . $row[0] . '</td>';
-			for($i = 1; $i <= 12; $i ++) {
-				print '<td align="right">' . price($row[$i]) . '</td>';
+			print '<tr><td>'.$row[0].'</td>';
+			for ($i = 1; $i <= 12; $i++) {
+				print '<td align="right">'.price($row[$i]).'</td>';
 			}
-			print '<td align="right"><b>' . price($row[13]) . '</b></td>';
+			print '<td align="right"><b>'.price($row[13]).'</b></td>';
 			print '</tr>';
 		}
 		$db->free($resql);
@@ -387,30 +387,30 @@ 
 	print '</div>';
 
 
-	if (! empty($conf->margin->enabled)) {
+	if (!empty($conf->margin->enabled)) {
 		print "<br>\n";
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre"><td width="400">' . $langs->trans("TotalMarge") . '</td>';
-		for($i = 1; $i <= 12; $i ++) {
-			print '<td width="60" align="right">' . $langs->trans('MonthShort' . str_pad($i, 2, '0', STR_PAD_LEFT)) . '</td>';
+		print '<tr class="liste_titre"><td width="400">'.$langs->trans("TotalMarge").'</td>';
+		for ($i = 1; $i <= 12; $i++) {
+			print '<td width="60" align="right">'.$langs->trans('MonthShort'.str_pad($i, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
-		print '<td width="60" align="right"><b>' . $langs->trans("Total") . '</b></td></tr>';
+		print '<td width="60" align="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-		$sql = "SELECT '" . $langs->trans("Vide") . "' AS marge,";
-		for($i = 1; $i <= 12; $i ++) {
-			$sql .= "  SUM(" . $db->ifsql('MONTH(f.datef)=' . $i, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0') . ") AS month" . str_pad($i, 2, '0', STR_PAD_LEFT) . ",";
+		$sql = "SELECT '".$langs->trans("Vide")."' AS marge,";
+		for ($i = 1; $i <= 12; $i++) {
+			$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$i, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0').") AS month".str_pad($i, 2, '0', STR_PAD_LEFT).",";
 		}
 		$sql .= "  SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-		$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-		$sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'";
-		$sql .= "  AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'";
-		$sql .= " AND f.entity IN (" . getEntity('facture', 0) . ")";   // We don't share object for accountancy
-		if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-			$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+		$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
+		$sql .= " WHERE f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
+		$sql .= "  AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
+		$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // We don't share object for accountancy
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 		} else {
-			$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+			$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 		}
 
 		dol_syslog('htdocs/accountancy/customer/index.php');
@@ -420,11 +420,11 @@ 
 
 			while ($row = $db->fetch_row($resql)) {
 
-				print '<tr><td>' . $row[0] . '</td>';
-				for($i = 1; $i <= 12; $i ++) {
-					print '<td align="right">' . price(price2num($row[$i])) . '</td>';
+				print '<tr><td>'.$row[0].'</td>';
+				for ($i = 1; $i <= 12; $i++) {
+					print '<td align="right">'.price(price2num($row[$i])).'</td>';
 				}
-				print '<td align="right"><b>' . price(price2num($row[13])) . '</b></td>';
+				print '<td align="right"><b>'.price(price2num($row[13])).'</b></td>';
 				print '</tr>';
 			}
 			$db->free($resql);

Braces +15 added lines, -7 removed lines

@@ -42,10 +42,12 @@ 
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->societe_id > 0)
+if ($user->societe_id > 0) {
 	accessforbidden();
-if (! $user->rights->accounting->bind->write)
+}
+if (! $user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 // Filter
 $year = GETPOST("year",'int');
@@ -238,15 +240,17 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
+		} else {
+			print length_accountg($row[0]);
 		}
-		else print length_accountg($row[0]);
 		print '</td>';
 		print '<td align="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
+		} else {
+			print $row[1];
 		}
-		else print $row[1];
 		print '</td>';
 		for($i = 2; $i <= 12; $i ++) {
 			print '<td align="right">' . price($row[$i]) . '</td>';
@@ -307,16 +311,18 @@ 
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("Unknown");
+		} else {
+			print length_accountg($row[0]);
 		}
-		else print length_accountg($row[0]);
 		print '</td>';
 
 		print '<td align="left">';
 		if ($row[0] == 'tobind')
 		{
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
+		} else {
+			print $row[1];
 		}
-		else print $row[1];
 		print '</td>';
 
 		for($i = 2; $i <= 12; $i ++) {
@@ -334,9 +340,11 @@ 
 print '</div>';
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) {
+	// This part of code looks strange. Why showing a report that should rely on result of this step ?
 {
 	print '<br>';
+}
 	print '<br>';
 
 	print_fiche_titre($langs->trans("OtherInfo"), '', '');

htdocs/accountancy/journal/purchasesjournal.php

Indentation +3 added lines, -3 removed lines

@@ -100,9 +100,9 @@ 
 $sql .= " AND fd.fk_code_ventilation > 0";
 $sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
 if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
 } else {
-    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
 }
 if ($date_start && $date_end)
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
@@ -277,7 +277,7 @@ 
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					    $bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
+						$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;

Spacing +152 added lines, -152 removed lines

@@ -27,19 +27,19 @@ 
  * \brief		Page with purchases journal
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-$langs->loadLangs(array("commercial", "compta","bills","other","accountancy","errors"));
+$langs->loadLangs(array("commercial", "compta", "bills", "other", "accountancy", "errors"));
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -71,7 +71,7 @@ 
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
 	$pastmonth = 12;
-	$pastmonthyear --;
+	$pastmonthyear--;
 }
 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -90,73 +90,73 @@ 
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
 //$sql .= " ct.accountancy_code_buy as account_tva";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";
+$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";
 //$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
+$sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0"; // TODO Facture annulée ?
 $sql .= " AND fd.fk_code_ventilation > 0";
-$sql .= " AND f.entity IN (" . getEntity('facture_fourn', 0) . ")";  // We don't share object for accountancy
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_SITUATION . ")";
+$sql .= " AND f.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+    $sql .= " AND f.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.",".FactureFournisseur::TYPE_SITUATION.")";
 } else {
-    $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
+    $sql .= " AND f.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.",".FactureFournisseur::TYPE_DEPOSIT.",".FactureFournisseur::TYPE_SITUATION.")";
 }
 if ($date_start && $date_end)
-	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 if ($in_bookkeeping == 'already')
-	$sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
+	$sql .= " AND f.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
 if ($in_bookkeeping == 'notyet')
-	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
+	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
 $sql .= " ORDER BY f.datef";
 
 dol_syslog('accountancy/journal/purchasesjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-	$tabfac = array ();
-	$tabht = array ();
-	$tabtva = array ();
-	$def_tva = array ();
-	$tabttc = array ();
-	$tablocaltax1 = array ();
-	$tablocaltax2 = array ();
-	$tabcompany = array ();
+	$tabfac = array();
+	$tabht = array();
+	$tabtva = array();
+	$def_tva = array();
+	$tabttc = array();
+	$tablocaltax1 = array();
+	$tablocaltax2 = array();
+	$tabcompany = array();
 
 	$num = $db->num_rows($result);
 
 	// Variables
-	$cptfour = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined';
-	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
+	$cptfour = (!empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined';
+	$cpttva = (!empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
 
 	$i = 0;
-	while ( $i < $num ) {
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
 		// Controls
-		$compta_soc = (! empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
+		$compta_soc = (!empty($obj->code_compta_fournisseur)) ? $obj->code_compta_fournisseur : $cptfour;
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
-				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
+				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
 			else
-				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
+				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
 		}
 
-		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
-		$compta_tva = (! empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
+		$compta_tva = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code))
 		{
-			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
 		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
 		$tabfac[$obj->rowid]["datereg"] = $db->jdate($obj->dlr);
-		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier . ' (' . $obj->ref . ')';
+		$tabfac[$obj->rowid]["ref"] = $obj->ref_supplier.' ('.$obj->ref.')';
 		$tabfac[$obj->rowid]["refsologest"] = $obj->ref;
 		$tabfac[$obj->rowid]["refsuppliersologest"] = $obj->ref_supplier;
 
@@ -165,25 +165,25 @@ 
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
 
 		// Avoid warnings
-		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+		if (!isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
-		$tabcompany[$obj->rowid] = array (
+		$tabcompany[$obj->rowid] = array(
 				'id' => $obj->socid,
 				'name' => $obj->name,
 				'code_fournisseur' => $obj->code_fournisseur,
 				'code_compta_fournisseur' => $compta_soc
 		);
 
-		$i ++;
+		$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -217,9 +217,9 @@ 
 		$invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32));
 
 		// Thirdparty
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabttc[$key] as $k => $mt ) {
+			foreach ($tabttc[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -228,12 +228,12 @@ 
 					$bookkeeping->date_create = $now;
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
 					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur'];
-					$bookkeeping->subledger_label = '';    // TODO To complete
+					$bookkeeping->subledger_label = ''; // TODO To complete
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("SubledgerAccount");
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->refsupplier.' - '.$langs->trans("SubledgerAccount");
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt <= 0) ? -$mt : 0;
@@ -262,9 +262,9 @@ 
 		}
 
 		// Product / Service
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabht[$key] as $k => $mt ) {
+			foreach ($tabht[$key] as $k => $mt) {
 				if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
@@ -276,12 +276,12 @@ 
 						$bookkeeping->date_create = $now;
 						$bookkeeping->doc_type = 'supplier_invoice';
 						$bookkeeping->fk_doc = $key;
-						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+						$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
 					    $bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label;
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->refsupplier.' - '.$accountingaccount->label;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 						$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -312,16 +312,16 @@ 
 
 		// VAT
 		// var_dump($tabtva);
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			$listoftax=array(0, 1, 2);
-			foreach($listoftax as $numtax)
+			$listoftax = array(0, 1, 2);
+			foreach ($listoftax as $numtax)
 			{
 				$arrayofvat = $tabtva;
 				if ($numtax == 1) $arrayofvat = $tablocaltax1;
 				if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-				foreach ( $arrayofvat[$key] as $k => $mt ) {
+				foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -330,12 +330,12 @@ 
 					$bookkeeping->date_create = $now;
 					$bookkeeping->doc_type = 'supplier_invoice';
 					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0;    // Useless, can be several lines that are source of this record to add
+					$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
 					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'');
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->refsupplier.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -364,7 +364,7 @@ 
 		}
 		}
 
-		if (! $errorforline)
+		if (!$errorforline)
 		{
 			$db->commit();
 		}
@@ -375,7 +375,7 @@ 
 			if ($error >= 10)
 			{
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-				break;  // Break in the foreach
+				break; // Break in the foreach
 			}
 		}
 	}
@@ -392,20 +392,20 @@ 
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
-	$action='';
+	$action = '';
 
 	// Must reload data, so we make a redirect
 	if (count($tabpay) != $error)
 	{
-		$param='id_journal='.$id_journal;
-		$param.='&date_startday='.$date_startday;
-		$param.='&date_startmonth='.$date_startmonth;
-		$param.='&date_startyear='.$date_startyear;
-		$param.='&date_endday='.$date_endday;
-		$param.='&date_endmonth='.$date_endmonth;
-		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookeeping='.$in_bookeeping;
-		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
+		$param = 'id_journal='.$id_journal;
+		$param .= '&date_startday='.$date_startday;
+		$param .= '&date_startmonth='.$date_startmonth;
+		$param .= '&date_startyear='.$date_startyear;
+		$param .= '&date_endday='.$date_endday;
+		$param .= '&date_endmonth='.$date_endmonth;
+		$param .= '&date_endyear='.$date_endyear;
+		$param .= '&in_bookeeping='.$in_bookeeping;
+		header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
 		exit;
 	}
 }
@@ -420,12 +420,12 @@ 
 if ($action == 'exportcsv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
-	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
 	$companystatic = new Fournisseur($db);
 	$invoicestatic = new FactureFournisseur($db);
 
-	foreach ( $tabfac as $key => $val )
+	foreach ($tabfac as $key => $val)
 	{
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
@@ -441,39 +441,39 @@ 
 			$date = dol_print_date($val["date"], 'day');
 
 			// Third party
-			foreach ( $tabttc[$key] as $k => $mt ) {
-				print '"' . $key . '"' . $sep;
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["refsologest"] . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep;
-				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
-				print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-				print '"' . $langs->trans("Code_tiers") . '"' . $sep;
-				print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep;
-				print '"' . $journal . '"' ;
+			foreach ($tabttc[$key] as $k => $mt) {
+				print '"'.$key.'"'.$sep;
+				print '"'.$date.'"'.$sep;
+				print '"'.$val["refsologest"].'"'.$sep;
+				print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+				print '"'.$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER.'"'.$sep;
+				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+				print '"'.$langs->trans("Code_tiers").'"'.$sep;
+				print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.$langs->trans("Code_tiers").'"'.$sep;
+				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+				print '"'.$journal.'"';
 				print "\n";
 			}
 
 			// Product / Service
-			foreach ( $tabht[$key] as $k => $mt ) {
+			foreach ($tabht[$key] as $k => $mt) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch(null, $k, true);
 				if ($mt) {
-					print '"' . $key . '"' . $sep;
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["refsologest"] . '"' . $sep;
-					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '""' . $sep;
-					print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep;
-					print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
-					print '"' . $journal . '"' ;
+					print '"'.$key.'"'.$sep;
+					print '"'.$date.'"'.$sep;
+					print '"'.$val["refsologest"].'"'.$sep;
+					print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					print '""'.$sep;
+					print '"'.utf8_decode(dol_trunc($accountingaccount->label, 32)).'"'.$sep;
+					print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.dol_trunc($accountingaccount->label, 32).'"'.$sep;
+					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+					print '"'.$journal.'"';
 					print "\n";
 				}
 			}
@@ -487,18 +487,18 @@ 
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
-					print '"' . $key . '"' . $sep;
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["refsologest"] . '"' . $sep;
-					print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '""' . $sep;
-					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key] . '"' . $sep;
-					print '"' . utf8_decode(dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep;
-					print '"' . $journal . '"' ;
+					print '"'.$key.'"'.$sep;
+					print '"'.$date.'"'.$sep;
+					print '"'.$val["refsologest"].'"'.$sep;
+					print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					print '""'.$sep;
+					print '"'.$langs->trans("VAT").' - '.$def_tva[$key].'"'.$sep;
+					print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$val["refsuppliersologest"].' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
+					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+					print '"'.$journal.'"';
 					print "\n";
 				}
 			}
@@ -510,22 +510,22 @@ 
 
 	llxHeader('', $langs->trans("PurchasesJournal"));
 
-	$nom = $langs->trans("PurchasesJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("PurchasesJournal").' - '.$accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
-	$builddate=dol_now();
-	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$builddate = dol_now();
+	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
 
-	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices = array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1).' - '.$form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1).' -  '.$langs->trans("AlreadyInGeneralLedger").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
-	$varlink = 'id_journal=' . $id_journal;
+	$varlink = 'id_journal='.$id_journal;
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
@@ -536,12 +536,12 @@ 
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	}
 	else {
-		print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+		print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 	}
-	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
+	print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	print '</div>';
 
 	// TODO Avoid using js. We can use a direct link with $param
@@ -569,13 +569,13 @@ 
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
-	print "<td>" . $langs->trans("Date") . "</td>";
-	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
-	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
-	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<td>".$langs->trans("Date")."</td>";
+	print "<td>".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")</td>";
+	print "<td>".$langs->trans("AccountAccounting")."</td>";
+	print "<td>".$langs->trans("SubledgerAccount")."</td>";
+	print "<td>".$langs->trans("LabelOperation")."</td>";
+	print "<td align='right'>".$langs->trans("Debit")."</td>";
+	print "<td align='right'>".$langs->trans("Credit")."</td>";
 	print "</tr>\n";
 
 	$r = '';
@@ -583,7 +583,7 @@ 
 	$invoicestatic = new FactureFournisseur($db);
 	$companystatic = new Fournisseur($db);
 
-	foreach ( $tabfac as $key => $val ) {
+	foreach ($tabfac as $key => $val) {
 		$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];
@@ -596,11 +596,11 @@ 
 		$date = dol_print_date($val["date"], 'day');
 
 		// Third party
-		foreach ( $tabttc[$key] as $k => $mt ) {
+		foreach ($tabttc[$key] as $k => $mt) {
 			print '<tr class="oddeven">';
 			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+			print "<td>".$date."</td>";
+			print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->supplier_code = $tabcompany[$key]['code_supplier'];
@@ -622,22 +622,22 @@ 
 			}
 			else print $accountoshow;
 			print '</td>';
-			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
-			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->refsupplier.' - '.$langs->trans("SubledgerAccount")."</td>";
+			print '<td align="right">'.($mt < 0 ? -price(-$mt) : '')."</td>";
+			print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
 		}
 
 		// Product / Service
-		foreach ( $tabht[$key] as $k => $mt ) {
+		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
@@ -652,9 +652,9 @@ 
 				print '</td>';
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
-				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->refsupplier.' - '.$accountingaccount->label."</td>";
+				print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 		}
@@ -666,12 +666,12 @@ 
 			if ($numtax == 1) $arrayofvat = $tablocaltax1;
 			if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-			foreach ( $arrayofvat[$key] as $k => $mt ) {
+			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
@@ -684,10 +684,10 @@ 
 				// Subledger account
 				print "<td>";
 				print '</td>';
-				print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
+				print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->refsupplier.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 				print "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 			}

Braces +76 added lines, -42 removed lines

@@ -48,13 +48,16 @@ 
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
 $in_bookkeeping = GETPOST('in_bookkeeping');
-if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
 
 $now = dol_now();
 
 // Security check
-if ($user->societe_id > 0)
+if ($user->societe_id > 0) {
 	accessforbidden();
+}
 
 /*
  * Actions
@@ -77,9 +80,11 @@ 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+if (empty($date_start) || empty($date_end)) {
+	// We define date_start and date_end
 {
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+}
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
@@ -104,12 +109,15 @@ 
 } else {
     $sql .= " AND f.type IN (" . FactureFournisseur::TYPE_STANDARD . "," . FactureFournisseur::TYPE_REPLACEMENT . "," . FactureFournisseur::TYPE_CREDIT_NOTE . "," . FactureFournisseur::TYPE_DEPOSIT . "," . FactureFournisseur::TYPE_SITUATION . ")";
 }
-if ($date_start && $date_end)
+if ($date_start && $date_end) {
 	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
-if ($in_bookkeeping == 'already')
+}
+if ($in_bookkeeping == 'already') {
 	$sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
-if ($in_bookkeeping == 'notyet')
+}
+if ($in_bookkeeping == 'notyet') {
 	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='supplier_invoice')";
+}
 $sql .= " ORDER BY f.datef";
 
 dol_syslog('accountancy/journal/purchasesjournal.php', LOG_DEBUG);
@@ -139,10 +147,11 @@ 
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
-			if ($obj->product_type == 0)
-				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
-			else
-				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
+			if ($obj->product_type == 0) {
+							$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
+			} else {
+							$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
+			}
 		}
 
 		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
@@ -165,11 +174,21 @@ 
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
 
 		// Avoid warnings
-		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (! isset($tabttc[$obj->rowid][$compta_soc])) {
+			$tabttc[$obj->rowid][$compta_soc] = 0;
+		}
+		if (! isset($tabht[$obj->rowid][$compta_prod])) {
+			$tabht[$obj->rowid][$compta_prod] = 0;
+		}
+		if (! isset($tabtva[$obj->rowid][$compta_tva])) {
+			$tabtva[$obj->rowid][$compta_tva] = 0;
+		}
+		if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) {
+			$tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		}
+		if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) {
+			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		}
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
@@ -244,13 +263,14 @@ 
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {
+							// Already exists
 						{
 							$error++;
+						}
 							$errorforline++;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
+						} else
 						{
 							$error++;
 							$errorforline++;
@@ -292,13 +312,14 @@ 
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {
+								// Already exists
 							{
 								$error++;
+							}
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							}
-							else
+							} else
 							{
 								$error++;
 								$errorforline++;
@@ -318,8 +339,12 @@ 
 			foreach($listoftax as $numtax)
 			{
 				$arrayofvat = $tabtva;
-				if ($numtax == 1) $arrayofvat = $tablocaltax1;
-				if ($numtax == 2) $arrayofvat = $tablocaltax2;
+				if ($numtax == 1) {
+					$arrayofvat = $tablocaltax1;
+				}
+				if ($numtax == 2) {
+					$arrayofvat = $tablocaltax2;
+				}
 
 				foreach ( $arrayofvat[$key] as $k => $mt ) {
 				if ($mt) {
@@ -346,13 +371,14 @@ 
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {
+							// Already exists
 						{
 							$error++;
+						}
 							$errorforline++;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						}
-						else
+						} else
 						{
 							$error++;
 							$errorforline++;
@@ -367,8 +393,7 @@ 
 		if (! $errorforline)
 		{
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 
@@ -382,12 +407,10 @@ 
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	}
-	elseif (count($tabpay) == $error)
+	} elseif (count($tabpay) == $error)
 	{
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
@@ -482,8 +505,12 @@ 
 			$listoftax = array(0, 1, 2);
 			foreach ($listoftax as $numtax) {
 				$arrayofvat = $tabtva;
-				if ($numtax == 1) $arrayofvat = $tablocaltax1;
-				if ($numtax == 2) $arrayofvat = $tablocaltax2;
+				if ($numtax == 1) {
+					$arrayofvat = $tablocaltax1;
+				}
+				if ($numtax == 2) {
+					$arrayofvat = $tablocaltax2;
+				}
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -537,8 +564,7 @@ 
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
-	}
-	else {
+	} else {
 		print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
 	}
 	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
@@ -610,8 +636,9 @@ 
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
+			} else {
+				print $accountoshow;
 			}
-			else print $accountoshow;
 			print '</td>';
 			// Subledger account
 			print "<td>";
@@ -619,8 +646,9 @@ 
 			if (empty($accountoshow) || $accountoshow == 'NotDefined')
 			{
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+			} else {
+				print $accountoshow;
 			}
-			else print $accountoshow;
 			print '</td>';
 			print "<td>" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
 			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
@@ -644,8 +672,9 @@ 
 				if (empty($accountoshow) || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
+				} else {
+					print $accountoshow;
 				}
-				else print $accountoshow;
 				print "</td>";
 				// Subledger account
 				print "<td>";
@@ -663,8 +692,12 @@ 
 		$listoftax = array(0, 1, 2);
 		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ( $arrayofvat[$key] as $k => $mt ) {
 				if ($mt) {
@@ -678,8 +711,9 @@ 
 				if (empty($accountoshow) || $accountoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
+				} else {
+					print $accountoshow;
 				}
-				else print $accountoshow;
 				print "</td>";
 				// Subledger account
 				print "<td>";

htdocs/accountancy/journal/sellsjournal.php

Indentation +4 added lines, -4 removed lines

@@ -295,7 +295,7 @@ 
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
 						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
-					    $bookkeeping->thirdparty_code = $companystatic->code_client;
+						$bookkeeping->thirdparty_code = $companystatic->code_client;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
@@ -550,12 +550,12 @@ 
 
 	// Button to write into Ledger
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-	    print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-	    print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
+		print img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+		print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
 	}
 	else {
 	   print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';

Spacing +151 added lines, -151 removed lines

@@ -30,19 +30,19 @@ 
  */
 
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-$langs->loadLangs(array("commercial", "compta","bills","other","accountancy","errors"));
+$langs->loadLangs(array("commercial", "compta", "bills", "other", "accountancy", "errors"));
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -75,7 +75,7 @@ 
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
 	$pastmonth = 12;
-	$pastmonthyear --;
+	$pastmonthyear--;
 }
 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -94,71 +94,71 @@ 
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 $sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
 //$sql .= " ct.accountancy_code_sell as account_tva";
-$sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = fd.fk_product";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc";
+$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
+$sql .= " JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
+$sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 //$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON ((fd.vat_src_code <> '' AND fd.vat_src_code = ct.code) OR (fd.vat_src_code = '' AND fd.tva_tx = ct.taux)) AND ct.fk_pays = '" . $idpays . "'";
 $sql .= " WHERE fd.fk_code_ventilation > 0";
-$sql .= " AND f.entity IN (".getEntity('facture', 0).')';	// We don't share object for accountancy
+$sql .= " AND f.entity IN (".getEntity('facture', 0).')'; // We don't share object for accountancy
 $sql .= " AND f.fk_statut > 0"; // TODO Facture annulée ?
-if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_SITUATION . ")";
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_SITUATION.")";
 } else {
-	$sql .= " AND f.type IN (" . Facture::TYPE_STANDARD . "," . Facture::TYPE_REPLACEMENT . "," . Facture::TYPE_CREDIT_NOTE . "," . Facture::TYPE_DEPOSIT . "," . Facture::TYPE_SITUATION . ")";
+	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 $sql .= " AND fd.product_type IN (0,1)";
 if ($date_start && $date_end)
-	$sql .= " AND f.datef >= '" . $db->idate($date_start) . "' AND f.datef <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 if ($in_bookkeeping == 'already')
-	$sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice')";
+	$sql .= " AND f.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice')";
 if ($in_bookkeeping == 'notyet')
-	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice')";
+	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='customer_invoice')";
 $sql .= " ORDER BY f.datef";
 
 dol_syslog('accountancy/journal/sellsjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
-	$tabfac = array ();
-	$tabht = array ();
-	$tabtva = array ();
-	$def_tva = array ();
-	$tabttc = array ();
-	$tablocaltax1 = array ();
-	$tablocaltax2 = array ();
-	$tabcompany = array ();
+	$tabfac = array();
+	$tabht = array();
+	$tabtva = array();
+	$def_tva = array();
+	$tabttc = array();
+	$tablocaltax1 = array();
+	$tablocaltax2 = array();
+	$tabcompany = array();
 
 	$num = $db->num_rows($result);
 
 	// Variables
-	$cptcli = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined';
-	$cpttva = (! empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : 'NotDefined';
+	$cptcli = (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined';
+	$cpttva = (!empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : 'NotDefined';
 
 	$i = 0;
-	while ( $i < $num ) {
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
 		// Controls
-		$compta_soc = (! empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
+		$compta_soc = (!empty($obj->code_compta)) ? $obj->code_compta : $cptcli;
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
 			if ($obj->product_type == 0)
-				$compta_prod = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : 'NotDefined';
+				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : 'NotDefined';
 			else
-				$compta_prod = (! empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : 'NotDefined';
+				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : 'NotDefined';
 		}
 
-		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
-		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
-		$compta_localtax1 = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
-		$compta_localtax2 = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
+		$compta_tva = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+		$compta_localtax1 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+		$compta_localtax2 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code))
 		{
-			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
 		// Situation invoices handling
@@ -185,25 +185,25 @@ 
 		//$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
 
 		// Avoid warnings
-		if (! isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (! isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
+		if (!isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1 * $situation_ratio;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2 * $situation_ratio;
-		$tabcompany[$obj->rowid] = array (
+		$tabcompany[$obj->rowid] = array(
 			'id' => $obj->socid,
 			'name' => $obj->name,
 			'code_client' => $obj->code_client,
 			'code_compta' => $compta_soc
 		);
 
-		$i ++;
+		$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -235,9 +235,9 @@ 
 		$invoicestatic->ref = (string) $val["ref"];
 
 		// Thirdparty
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabttc[$key] as $k => $mt ) {
+			foreach ($tabttc[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -246,12 +246,12 @@ 
 					$bookkeeping->date_create = $now;
 					$bookkeeping->doc_type = 'customer_invoice';
 					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+					$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
 					$bookkeeping->thirdparty_code = $companystatic->code_client;
 					$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
-					$bookkeeping->subledger_label = '';    // TODO To complete
+					$bookkeeping->subledger_label = ''; // TODO To complete
 					$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
-					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount");
+					$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount");
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0) ? $mt : 0;
@@ -280,9 +280,9 @@ 
 		}
 
 		// Product / Service
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabht[$key] as $k => $mt ) {
+			foreach ($tabht[$key] as $k => $mt) {
 				if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
@@ -294,12 +294,12 @@ 
 						$bookkeeping->date_create = $now;
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
-						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+						$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
 					    $bookkeeping->thirdparty_code = $companystatic->code_client;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label;
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$accountingaccount->label;
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 						$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
@@ -330,16 +330,16 @@ 
 
 		// VAT
 		// var_dump($tabtva);
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			$listoftax=array(0, 1, 2);
-			foreach($listoftax as $numtax)
+			$listoftax = array(0, 1, 2);
+			foreach ($listoftax as $numtax)
 			{
 				$arrayofvat = $tabtva;
 				if ($numtax == 1) $arrayofvat = $tablocaltax1;
 				if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-				foreach ( $arrayofvat[$key] as $k => $mt ) {
+				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
 						$bookkeeping = new BookKeeping($db);
 						$bookkeeping->doc_date = $val["date"];
@@ -348,12 +348,12 @@ 
 						$bookkeeping->date_create = $now;
 						$bookkeeping->doc_type = 'customer_invoice';
 						$bookkeeping->fk_doc = $key;
-						$bookkeeping->fk_docdet = 0;	// Useless, can be several lines that are source of this record to add
+						$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
 						$bookkeeping->thirdparty_code = $companystatic->code_client;
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->subledger_label = '';
 						$bookkeeping->numero_compte = $k;
-						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'');
+						$bookkeeping->label_operation = dol_trunc($companystatic->name, 16).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 						$bookkeeping->montant = $mt;
 						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
 						$bookkeeping->debit = ($mt < 0) ? -$mt : 0;
@@ -382,7 +382,7 @@ 
 			}
 		}
 
-		if (! $errorforline)
+		if (!$errorforline)
 		{
 			$db->commit();
 		}
@@ -393,7 +393,7 @@ 
 			if ($error >= 10)
 			{
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-				break;  // Break in the foreach
+				break; // Break in the foreach
 			}
 		}
 
@@ -411,20 +411,20 @@ 
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
-	$action='';
+	$action = '';
 
 	// Must reload data, so we make a redirect
 	if (count($tabpay) != $error)
 	{
-		$param='id_journal='.$id_journal;
-		$param.='&date_startday='.$date_startday;
-		$param.='&date_startmonth='.$date_startmonth;
-		$param.='&date_startyear='.$date_startyear;
-		$param.='&date_endday='.$date_endday;
-		$param.='&date_endmonth='.$date_endmonth;
-		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookeeping='.$in_bookeeping;
-		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
+		$param = 'id_journal='.$id_journal;
+		$param .= '&date_startday='.$date_startday;
+		$param .= '&date_startmonth='.$date_startmonth;
+		$param .= '&date_startyear='.$date_startyear;
+		$param .= '&date_endday='.$date_endday;
+		$param .= '&date_endmonth='.$date_endmonth;
+		$param .= '&date_endyear='.$date_endyear;
+		$param .= '&in_bookeeping='.$in_bookeeping;
+		header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
 		exit;
 	}
 }
@@ -442,12 +442,12 @@ 
 
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
-	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
 	$companystatic = new Client($db);
 	$invoicestatic = new Facture($db);
 
-	foreach ( $tabfac as $key => $val )
+	foreach ($tabfac as $key => $val)
 	{
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
@@ -460,18 +460,18 @@ 
 
 		// Third party
 		foreach ($tabttc[$key] as $k => $mt) {
-			print '"' . $key . '"' . $sep;
-			print '"' . $date . '"' . $sep;
-			print '"' . $val["ref"] . '"' . $sep;
-			print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
-			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-			print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
-			print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
-			print '"' . $langs->trans("Code_tiers") . '"' . $sep;
-			print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("Code_tiers") . '"' . $sep;
-			print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-			print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-			print '"' . $journal . '"';
+			print '"'.$key.'"'.$sep;
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["ref"].'"'.$sep;
+			print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER.'"'.$sep;
+			print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+			print '"'.$langs->trans("Code_tiers").'"'.$sep;
+			print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("Code_tiers").'"'.$sep;
+			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+			print '"'.$journal.'"';
 			print "\n";
 		}
 
@@ -480,18 +480,18 @@ 
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 			if ($mt) {
-				print '"' . $key . '"' . $sep;
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["ref"] . '"' . $sep;
-				print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-				print '""' . $sep;
-				print '"' . utf8_decode(dol_trunc($accountingaccount->label, 32)) . '"' . $sep;
-				print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep;
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-				print '"' . $journal . '"';
+				print '"'.$key.'"'.$sep;
+				print '"'.$date.'"'.$sep;
+				print '"'.$val["ref"].'"'.$sep;
+				print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+				print '""'.$sep;
+				print '"'.utf8_decode(dol_trunc($accountingaccount->label, 32)).'"'.$sep;
+				print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.dol_trunc($accountingaccount->label, 32).'"'.$sep;
+				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+				print '"'.$journal.'"';
 				print "\n";
 			}
 		}
@@ -505,18 +505,18 @@ 
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
-					print '"' . $key . '"' . $sep;
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["ref"] . '"' . $sep;
-					print '"' . utf8_decode(dol_trunc($companystatic->name, 32)) . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-					print '""' . $sep;
-					print '"' . $langs->trans("VAT") . ' - ' . $def_tva[$key] . ' %"' . $sep;
-					print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:'') . '"' . $sep;
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-					print '"' . $journal . '"';
+					print '"'.$key.'"'.$sep;
+					print '"'.$date.'"'.$sep;
+					print '"'.$val["ref"].'"'.$sep;
+					print '"'.utf8_decode(dol_trunc($companystatic->name, 32)).'"'.$sep;
+					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+					print '""'.$sep;
+					print '"'.$langs->trans("VAT").' - '.$def_tva[$key].' %"'.$sep;
+					print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep;
+					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+					print '"'.$journal.'"';
 					print "\n";
 				}
 			}
@@ -530,21 +530,21 @@ 
 
 	llxHeader('', $langs->trans("SellsJournal"));
 
-	$nom = $langs->trans("SellsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("SellsJournal").' - '.$accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
-	$builddate=dol_now();
-	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
-	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+	$builddate = dol_now();
+	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
 		$description .= $langs->trans("DepositsAreNotIncluded");
 	else
 		$description .= $langs->trans("DepositsAreIncluded");
 
-	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices = array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1).' - '.$form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1).' -  '.$langs->trans("AlreadyInGeneralLedger").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
-	$varlink = 'id_journal=' . $id_journal;
+	$varlink = 'id_journal='.$id_journal;
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
@@ -555,12 +555,12 @@ 
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
-	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	}
 	else {
-	   print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	   print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 	}
-	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
+	print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	print '</div>';
 
 	// TODO Avoid using js. We can use a direct link with $param
@@ -588,13 +588,13 @@ 
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
-	print "<td>" . $langs->trans("Date") . "</td>";
-	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("InvoiceRef") . ")</td>";
-	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
-	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<td>".$langs->trans("Date")."</td>";
+	print "<td>".$langs->trans("Piece").' ('.$langs->trans("InvoiceRef").")</td>";
+	print "<td>".$langs->trans("AccountAccounting")."</td>";
+	print "<td>".$langs->trans("SubledgerAccount")."</td>";
+	print "<td>".$langs->trans("LabelOperation")."</td>";
+	print "<td align='right'>".$langs->trans("Debit")."</td>";
+	print "<td align='right'>".$langs->trans("Credit")."</td>";
 	print "</tr>\n";
 
 	$r = '';
@@ -602,7 +602,7 @@ 
 	$invoicestatic = new Facture($db);
 	$companystatic = new Client($db);
 
-	foreach ( $tabfac as $key => $val ) {
+	foreach ($tabfac as $key => $val) {
 		$invoicestatic->id = $key;
 		$invoicestatic->ref = $val["ref"];
 		$invoicestatic->type = $val["type"];
@@ -610,11 +610,11 @@ 
 		$date = dol_print_date($val["date"], 'day');
 
 		// Third party
-		foreach ( $tabttc[$key] as $k => $mt ) {
+		foreach ($tabttc[$key] as $k => $mt) {
 			print '<tr class="oddeven">';
 			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+			print "<td>".$date."</td>";
+			print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
 			$companystatic->customer_code = $tabcompany[$key]['code_client'];
@@ -636,22 +636,22 @@ 
 			}
 			else print $accountoshow;
 			print '</td>';
-			print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-			print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount")."</td>";
+			print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+			print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 			print "</tr>";
 		}
 
 		// Product / Service
-		foreach ( $tabht[$key] as $k => $mt ) {
+		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Product --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
@@ -666,9 +666,9 @@ 
 				print '</td>';
 				$companystatic->id = $tabcompany[$key]['id'];
 				$companystatic->name = $tabcompany[$key]['name'];
-				print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $accountingaccount->label . "</td>";
-				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
-				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$accountingaccount->label."</td>";
+				print "<td align='right'>".($mt < 0 ? price(-$mt) : '')."</td>";
+				print "<td align='right'>".($mt >= 0 ? price($mt) : '')."</td>";
 				print "</tr>";
 			}
 		}
@@ -680,12 +680,12 @@ 
 			if ($numtax == 1) $arrayofvat = $tablocaltax1;
 			if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-			foreach ( $arrayofvat[$key] as $k => $mt ) {
+			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
 					print '<tr class="oddeven">';
 					print "<td><!-- VAT --></td>";
-					print "<td>" . $date . "</td>";
-					print "<td>" . $invoicestatic->getNomUrl(1) . "</td>";
+					print "<td>".$date."</td>";
+					print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 					// Account
 					print "<td>";
 					$accountoshow = length_accountg($k);
@@ -698,10 +698,10 @@ 
 					// Subledger account
 					print "<td>";
 					print '</td>';
-					print "<td>" . $companystatic->getNomUrl(0, 'customer', 16) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
+					print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 					print "</td>";
-					print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
-					print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+					print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
+					print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
 				}
 			}

htdocs/accountancy/journal/bankjournal.php

Spacing +241 added lines, -241 removed lines

@@ -28,48 +28,48 @@ 
  * \brief 		Page with bank journal
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/sociales/class/chargesociales.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php';
-require_once DOL_DOCUMENT_ROOT . '/don/class/paymentdonation.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/salaries/class/paymentsalary.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/client.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/paymentvarious.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
-
-$langs->loadLangs(array("companies","other","compta","banks",'bills','donations',"accountancy","trips","salaries","hrm"));
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
+require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+
+$langs->loadLangs(array("companies", "other", "compta", "banks", 'bills', 'donations', "accountancy", "trips", "salaries", "hrm"));
 
 // Multi journal
 $id_journal = GETPOST('id_journal', 'int');
 
-$date_startmonth = GETPOST('date_startmonth','int');
-$date_startday = GETPOST('date_startday','int');
-$date_startyear = GETPOST('date_startyear','int');
-$date_endmonth = GETPOST('date_endmonth','int');
-$date_endday = GETPOST('date_endday','int');
-$date_endyear = GETPOST('date_endyear','int');
-$in_bookkeeping = GETPOST('in_bookkeeping','aZ09');
+$date_startmonth = GETPOST('date_startmonth', 'int');
+$date_startday = GETPOST('date_startday', 'int');
+$date_startyear = GETPOST('date_startyear', 'int');
+$date_endmonth = GETPOST('date_endmonth', 'int');
+$date_endday = GETPOST('date_endday', 'int');
+$date_endyear = GETPOST('date_endyear', 'int');
+$in_bookkeeping = GETPOST('in_bookkeeping', 'aZ09');
 if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
 
 $now = dol_now();
 
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 // Security check
 if ($user->societe_id > 0 && empty($id_journal))
@@ -87,7 +87,7 @@ 
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
 	$pastmonth = 12;
-	$pastmonthyear --;
+	$pastmonthyear--;
 }
 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -106,22 +106,22 @@ 
 $sql .= " soc.code_compta, soc.code_compta_fournisseur, soc.rowid as socid, soc.nom as name, bu1.type as typeop_company,";
 $sql .= " u.accountancy_code, u.rowid as userid, u.lastname as lastname, u.firstname as firstname, bu2.type as typeop_user,";
 $sql .= " bu3.type as typeop_payment, bu4.type as typeop_payment_supplier";
-$sql .= " FROM " . MAIN_DB_PREFIX . "bank as b";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "bank_account as ba on b.fk_account=ba.rowid";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='user'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as soc on bu1.url_id=soc.rowid";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "user as u on bu2.url_id=u.rowid";
-$sql .= " WHERE ba.fk_accountancy_journal=" . $id_journal;
-$sql .= ' AND b.amount != 0 AND ba.entity IN ('.getEntity('bank_account', 0).')';		// We don't share object for accountancy
+$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
+$sql .= " JOIN ".MAIN_DB_PREFIX."bank_account as ba on b.fk_account=ba.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu1 ON bu1.fk_bank = b.rowid AND bu1.type='company'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu2 ON bu2.fk_bank = b.rowid AND bu2.type='user'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu3 ON bu3.fk_bank = b.rowid AND bu3.type='payment'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu4 ON bu4.fk_bank = b.rowid AND bu4.type='payment_supplier'";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc on bu1.url_id=soc.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid";
+$sql .= " WHERE ba.fk_accountancy_journal=".$id_journal;
+$sql .= ' AND b.amount != 0 AND ba.entity IN ('.getEntity('bank_account', 0).')'; // We don't share object for accountancy
 if ($date_start && $date_end)
-	$sql .= " AND b.dateo >= '" . $db->idate($date_start) . "' AND b.dateo <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND b.dateo >= '".$db->idate($date_start)."' AND b.dateo <= '".$db->idate($date_end)."'";
 if ($in_bookkeeping == 'already')
-	$sql .= " AND (b.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
+	$sql .= " AND (b.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
 if ($in_bookkeeping == 'notyet')
-	$sql .= " AND (b.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
+	$sql .= " AND (b.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='bank') )";
 $sql .= " ORDER BY b.datev";
 //print $sql;
 
@@ -152,34 +152,34 @@ 
 	//print $sql;
 
 	// Variables
-	$account_supplier = (! empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined');	// NotDefined is a reserved word
-	$account_customer = (! empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined');	// NotDefined is a reserved word
-	$account_employee = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined');	// NotDefined is a reserved word
-	$account_pay_vat = (! empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined');	// NotDefined is a reserved word
-	$account_pay_donation = (! empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined');	// NotDefined is a reserved word
-	$account_transfer = (! empty($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) ? $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH : 'NotDefined');	// NotDefined is a reserved word
+	$account_supplier = (!empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER) ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined'); // NotDefined is a reserved word
+	$account_customer = (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER) ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined'); // NotDefined is a reserved word
+	$account_employee = (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_vat = (!empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_donation = (!empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_transfer = (!empty($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) ? $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH : 'NotDefined'); // NotDefined is a reserved word
 
 	$tabcompany = array();
 	$tabuser = array();
-	$tabpay = array ();
-	$tabbq = array ();
-	$tabtp = array ();
-	$tabtype = array ();
+	$tabpay = array();
+	$tabbq = array();
+	$tabtp = array();
+	$tabtype = array();
 
 	// Loop on each line into llx_bank table. For each line, we should get:
 	// one line tabpay = line into bank
 	// one line for bank record = tabbq
 	// one line for thirdparty record = tabtp
 	$i = 0;
-	while ( $i < $num )
+	while ($i < $num)
 	{
 		$obj = $db->fetch_object($result);
 
 		$lineisapurchase = -1;
 		$lineisasale = -1;
 		// Old method to detect if it's a sale or purchase
-		if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)') $lineisapurchase=1;
-		if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)') $lineisasale=1;
+		if ($obj->label == '(SupplierInvoicePayment)' || $obj->label == '(SupplierInvoicePaymentBack)') $lineisapurchase = 1;
+		if ($obj->label == '(CustomerInvoicePayment)' || $obj->label == '(CustomerInvoicePaymentBack)') $lineisasale = 1;
 		// Try a more reliable method to detect if record is a supplier payment or a customer payment
 		if ($lineisapurchase < 0)
 		{
@@ -198,20 +198,20 @@ 
 		// Set accountancy code for thirdparty
 		$compta_soc = 'NotDefined';
 		if ($lineisapurchase > 0)
-			$compta_soc = (! empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $account_supplier);
+			$compta_soc = (!empty($obj->code_compta_fournisseur) ? $obj->code_compta_fournisseur : $account_supplier);
 		if ($lineisasale > 0)
-			$compta_soc = (! empty($obj->code_compta) ? $obj->code_compta : $account_customer);
+			$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $account_customer);
 
-		$tabcompany[$obj->rowid] = array (
+		$tabcompany[$obj->rowid] = array(
 				'id' => $obj->socid,
 				'name' => $obj->name,
 				'code_compta' => $compta_soc,
 		);
 
 		// Set accountancy code for user
-		$compta_user = (! empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
+		$compta_user = (!empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
 
-		$tabuser[$obj->rowid] = array (
+		$tabuser[$obj->rowid] = array(
 				'id' => $obj->userid,
 				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
 				'lastname' => $obj->lastname,
@@ -221,8 +221,8 @@ 
 
 		// Variable bookkeeping
 		$tabpay[$obj->rowid]["date"] = $obj->do;
-		$tabpay[$obj->rowid]["type_payment"] = $obj->fk_type;		// CHQ, VIR, LIQ, CB, ...
-		$tabpay[$obj->rowid]["ref"] = $obj->label;					// By default. Not unique. May be changed later
+		$tabpay[$obj->rowid]["type_payment"] = $obj->fk_type; // CHQ, VIR, LIQ, CB, ...
+		$tabpay[$obj->rowid]["ref"] = $obj->label; // By default. Not unique. May be changed later
 		$tabpay[$obj->rowid]["fk_bank"] = $obj->rowid;
 		$tabpay[$obj->rowid]["bank_account_ref"] = $obj->baref;
 		$tabpay[$obj->rowid]["fk_bank_account"] = $obj->fk_account;
@@ -237,7 +237,7 @@ 
 		//var_dump($tabpay);
 
 		// By default
-		$tabpay[$obj->rowid]['type'] = 'unknown';	// Can be SOLD, miscellaneous entry, payment of patient, or any old record with no links in bank_url.
+		$tabpay[$obj->rowid]['type'] = 'unknown'; // Can be SOLD, miscellaneous entry, payment of patient, or any old record with no links in bank_url.
 		$tabtype[$obj->rowid] = 'unknown';
 
 		// get_url may return -1 which is not traversable
@@ -265,12 +265,12 @@ 
 
 				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id;
 				} else if ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsupplierstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsupplierstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsupplierid"] = $paymentsupplierstatic->id;
 				} else if ($links[$key]['type'] == 'company') {
 					$societestatic->id = $links[$key]['url_id'];
@@ -281,13 +281,13 @@ 
 					$userstatic->id = $links[$key]['url_id'];
 					$userstatic->name = $links[$key]['label'];
 					if ($userstatic->id > 0) $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, '', 30);
-					else $tabpay[$obj->rowid]["soclib"] = '???';	// Should not happen, but happens with old data when id of user was not saved on expense report payment.
+					else $tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
 					if ($compta_user) $tabtp[$obj->rowid][$compta_user] += $obj->amount;
 				} else if ($links[$key]['type'] == 'sc') {
 					$chargestatic->id = $links[$key]['url_id'];
 					$chargestatic->ref = $links[$key]['url_id'];
 
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $chargestatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$chargestatic->getNomUrl(2);
 					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						if ($reg[1] == 'socialcontribution')
 							$reg[1] = 'SocialContribution';
@@ -299,13 +299,13 @@ 
 					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
 
 					$sqlmid = 'SELECT cchgsoc.accountancy_code';
-					$sqlmid .= " FROM " . MAIN_DB_PREFIX . "c_chargesociales cchgsoc ";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "chargesociales as chgsoc ON chgsoc.fk_type=cchgsoc.id";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "paiementcharge as paycharg ON paycharg.fk_charge=chgsoc.rowid";
-					$sqlmid .= " INNER JOIN " . MAIN_DB_PREFIX . "bank_url as bkurl ON bkurl.url_id=paycharg.rowid";
-					$sqlmid .= " WHERE bkurl.fk_bank=" . $obj->rowid;
+					$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc ";
+					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."chargesociales as chgsoc ON chgsoc.fk_type=cchgsoc.id";
+					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."paiementcharge as paycharg ON paycharg.fk_charge=chgsoc.rowid";
+					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."bank_url as bkurl ON bkurl.url_id=paycharg.rowid";
+					$sqlmid .= " WHERE bkurl.fk_bank=".$obj->rowid;
 
-					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=" . $sqlmid, LOG_DEBUG);
+					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
 					$resultmid = $db->query($sqlmid);
 					if ($resultmid) {
 						$objmid = $db->fetch_object($resultmid);
@@ -314,37 +314,37 @@ 
 				} else if ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonstatic->id = $links[$key]['url_id'];
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentdonstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentdonstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
 					$tabtp[$obj->rowid][$account_pay_donation] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$paymentvatstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvatstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentvatstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
 					$tabtp[$obj->rowid][$account_pay_vat] += $obj->amount;
 				} else if ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentsalstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
 				} else if ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentexpensereportstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentexpensereportstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentexpensereport"] = $paymentexpensereportstatic->id;
 				} else if ($links[$key]['type'] == 'payment_various') {
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $links[$key]['url_id'];
 					$paymentvariousstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $paymentvariousstatic->getNomUrl(2);
+					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentvariousstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentvariousid"] = $paymentvariousstatic->id;
 					$paymentvariousstatic->fetch($paymentvariousstatic->id);
-					$account_various = (! empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined');	// NotDefined is a reserved word
+					$account_various = (!empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined'); // NotDefined is a reserved word
 					$tabtp[$obj->rowid][$account_various] += $obj->amount;
 				} else if ($links[$key]['type'] == 'banktransfert') {
-					$tabpay[$obj->rowid]["lib"] .= ' ' . $langs->trans("BankTransfer");
+					$tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer");
 					$tabtp[$obj->rowid][$account_transfer] += $obj->amount;
 					$bankaccountstatic->fetch($tabpay[$obj->rowid]['fk_bank_account']);
 					$tabpay[$obj->rowid]["soclib"] = $bankaccountstatic->getNomUrl(2);
@@ -355,7 +355,7 @@ 
 		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
 
 		// If not links were found to know amount on thirdparty, we init it.
-		if (empty($tabtp[$obj->rowid])) $tabtp[$obj->rowid]['NotDefined']= $tabbq[$obj->rowid][$compta_bank];
+		if (empty($tabtp[$obj->rowid])) $tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
 
 		// Check account number is ok
 		/*if ($action == 'writebookkeeping')		// Make test now in such a case
@@ -391,11 +391,11 @@ 
 */
 
 // Write bookkeeping
-if (! $error && $action == 'writebookkeeping') {
+if (!$error && $action == 'writebookkeeping') {
 	$now = dol_now();
 
 	$error = 0;
-	foreach ( $tabpay as $key => $val ) {	  // $key is rowid into llx_bank
+	foreach ($tabpay as $key => $val) {	  // $key is rowid into llx_bank
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
@@ -409,10 +409,10 @@ 
 		var_dump($tabbq);exit;*/
 
 		// Bank
-		if (! $errorforline && is_array($tabbq[$key]))
+		if (!$errorforline && is_array($tabbq[$key]))
 		{
 			// Line into bank account
-			foreach ( $tabbq[$key] as $k => $mt )
+			foreach ($tabbq[$key] as $k => $mt)
 			{
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
@@ -426,7 +426,7 @@ 
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
 					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-					$bookkeeping->credit = ($mt < 0 ? - $mt : 0);
+					$bookkeeping->credit = ($mt < 0 ? -$mt : 0);
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
 					$bookkeeping->fk_user_author = $user->id;
@@ -435,16 +435,16 @@ 
 					// No subledger_account value for the bank line but add a specific label_operation
 					if ($tabtype[$key] == 'payment') {
 						$bookkeeping->subledger_account = '';
-						$bookkeeping->label_operation = $tabcompany[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabcompany[$key]['name'].' - '.$ref;
 					} else if ($tabtype[$key] == 'payment_supplier') {
 						$bookkeeping->subledger_account = '';
-						$bookkeeping->label_operation = $tabcompany[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabcompany[$key]['name'].' - '.$ref;
 					} else if ($tabtype[$key] == 'payment_expensereport') {
 						$bookkeeping->subledger_account = '';
-						$bookkeeping->label_operation = $tabuser[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabuser[$key]['name'].' - '.$ref;
 					} else if ($tabtype[$key] == 'payment_salary') {
 						$bookkeeping->subledger_account = '';
-						$bookkeeping->label_operation = $tabuser[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabuser[$key]['name'].' - '.$ref;
 					} else if ($tabtype[$key] == 'payment_vat') {
 						$bookkeeping->subledger_account = '';
 						$bookkeeping->label_operation = $ref;
@@ -479,10 +479,10 @@ 
 		}
 
 		// Third party
-		if (! $errorforline && is_array($tabtp[$key]))
+		if (!$errorforline && is_array($tabtp[$key]))
 		{
 			// Line into thirdparty account
-			foreach ( $tabtp[$key] as $k => $mt ) {
+			foreach ($tabtp[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -492,7 +492,7 @@ 
 					$bookkeeping->fk_docdet = $val["fk_bank"];
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-					$bookkeeping->debit = ($mt < 0 ? - $mt : 0);
+					$bookkeeping->debit = ($mt < 0 ? -$mt : 0);
 					$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
 					$bookkeeping->code_journal = $journal;
 					$bookkeeping->journal_label = $journal_label;
@@ -500,25 +500,25 @@ 
 					$bookkeeping->date_create = $now;
 
 					if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
-						$bookkeeping->label_operation = $tabcompany[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabcompany[$key]['name'].' - '.$ref;
 						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 						$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
 						$bookkeeping->label_compte = '';
 					} else if ($tabtype[$key] == 'payment_supplier') {		   // If payment is payment of supplier invoice, we get ref of invoice
-						$bookkeeping->label_operation = $tabcompany[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabcompany[$key]['name'].' - '.$ref;
 						$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
 						$bookkeeping->subledger_label = $tabcompany[$key]['name'];
 						$bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
 						$bookkeeping->label_compte = '';
 					} else if ($tabtype[$key] == 'payment_expensereport') {
-						$bookkeeping->label_operation = $tabuser[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabuser[$key]['name'].' - '.$ref;
 						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 						$bookkeeping->subledger_label = $tabuser[$key]['name'];
 						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
 						$bookkeeping->label_compte = '';
 					} else if ($tabtype[$key] == 'payment_salary') {
-						$bookkeeping->label_operation = $tabuser[$key]['name'] . ' - ' . $ref;
+						$bookkeeping->label_operation = $tabuser[$key]['name'].' - '.$ref;
 						$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
 						$bookkeeping->subledger_label = $tabuser[$key]['name'];
 						$bookkeeping->numero_compte = $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT;
@@ -584,7 +584,7 @@ 
 			}
 		}
 
-		if (! $errorforline)
+		if (!$errorforline)
 		{
 			$db->commit();
 		}
@@ -593,11 +593,11 @@ 
 			//print 'KO for line '.$key.' '.$error.'<br>';
 			$db->rollback();
 
-			$MAXNBERRORS=5;
+			$MAXNBERRORS = 5;
 			if ($error >= $MAXNBERRORS)
 			{
 			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped").' (>'.$MAXNBERRORS.')', null, 'errors');
-			    break;  // Break in the foreach
+			    break; // Break in the foreach
 			}
 		}
 	}
@@ -619,15 +619,15 @@ 
 	// Must reload data, so we make a redirect
 	if (count($tabpay) != $error)
 	{
-		$param='id_journal='.$id_journal;
-		$param.='&date_startday='.$date_startday;
-		$param.='&date_startmonth='.$date_startmonth;
-		$param.='&date_startyear='.$date_startyear;
-		$param.='&date_endday='.$date_endday;
-		$param.='&date_endmonth='.$date_endmonth;
-		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookeeping='.$in_bookeeping;
-		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
+		$param = 'id_journal='.$id_journal;
+		$param .= '&date_startday='.$date_startday;
+		$param .= '&date_startmonth='.$date_startmonth;
+		$param .= '&date_startyear='.$date_startyear;
+		$param .= '&date_endday='.$date_endday;
+		$param .= '&date_endmonth='.$date_endmonth;
+		$param .= '&date_endyear='.$date_endyear;
+		$param .= '&in_bookeeping='.$in_bookeeping;
+		header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
 		exit;
 	}
 }
@@ -638,18 +638,18 @@ 
 if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
-	include DOL_DOCUMENT_ROOT . '/accountancy/tpl/export_journal.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
 
 	$companystatic = new Client($db);
 	$userstatic = new User($db);
 
-	foreach ( $tabpay as $key => $val ) {
+	foreach ($tabpay as $key => $val) {
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
 		//
-		if (! empty($tabcompany[$key]['id']))
+		if (!empty($tabcompany[$key]['id']))
 		{
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
@@ -659,7 +659,7 @@ 
 			$companystatic->id = 0;
 			$companystatic->name = '';
 		}
-		if (! empty($tabuser[$key]['id']))
+		if (!empty($tabuser[$key]['id']))
 		{
 			$userstatic->id = $tabuser[$key]['id'];
 			$userstatic->lastname = $tabuser[$key]['lastname'];
@@ -673,64 +673,64 @@ 
 		}
 
 		// Bank
-		foreach ( $tabbq[$key] as $k => $mt ) {
-			print '"' . $journal . '"' . $sep;
-			print '"' . $date . '"' . $sep;
-			print '"' . $val["type_payment"] . '"' . $sep;
-			print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-			print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep;
-			print "  " . $sep;
+		foreach ($tabbq[$key] as $k => $mt) {
+			print '"'.$journal.'"'.$sep;
+			print '"'.$date.'"'.$sep;
+			print '"'.$val["type_payment"].'"'.$sep;
+			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+			print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+			print "  ".$sep;
 			if ($companystatic->name == '') {
-				print '"' . $val['bank_account_ref'] . " - " . utf8_decode($reflabel) . '"' . $sep;
+				print '"'.$val['bank_account_ref']." - ".utf8_decode($reflabel).'"'.$sep;
 			} else {
-				print '"' . $val['bank_account_ref'] . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
+				print '"'.$val['bank_account_ref'].' - '.utf8_decode($companystatic->name).'"'.$sep;
 			}
-			print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep;
-			print '"' . ($mt < 0 ? price(- $mt) : '') . '"';
+			print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+			print '"'.($mt < 0 ? price(-$mt) : '').'"';
 			print "\n";
 		}
 
 		// Third party
 		if (is_array($tabtp[$key])) {
-			foreach ( $tabtp[$key] as $k => $mt ) {
+			foreach ($tabtp[$key] as $k => $mt) {
 				if ($mt) {
-					print '"' . $journal . '"' . $sep;
-					print '"' . $date . '"' . $sep;
-					print '"' . $val["type_payment"] . '"' . $sep;
-					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					print '"'.$journal.'"'.$sep;
+					print '"'.$date.'"'.$sep;
+					print '"'.$val["type_payment"].'"'.$sep;
+					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 					if ($tabtype[$key] == 'payment_supplier') {
-					print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep;
-					} else if($tabtype[$key] == 'payment') {
-					print '"' . $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER . '"' . $sep;
+					print '"'.$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER.'"'.$sep;
+					} else if ($tabtype[$key] == 'payment') {
+					print '"'.$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER.'"'.$sep;
 					} else {
-					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 					}
-					print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep;
+					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
 					if ($companystatic->name == '') {
-						print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($reflabel) . '"' . $sep;
+						print '"'.$langs->trans('ThirdParty')." - ".utf8_decode($reflabel).'"'.$sep;
 					} else {
-						print '"' . $langs->trans('ThirdParty') . " - " . utf8_decode($companystatic->name) . '"' . $sep;
+						print '"'.$langs->trans('ThirdParty')." - ".utf8_decode($companystatic->name).'"'.$sep;
 					}
-					print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-					print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+					print '"'.($mt >= 0 ? price($mt) : '').'"';
 					print "\n";
 				}
 			}
 		} else {
-			foreach ( $tabbq[$key] as $k => $mt ) {
-				print '"' . $journal . '"' . $sep;
-				print '"' . $date . '"' . $sep;
-				print '"' . $val["type_payment"] . '"' . $sep;
-				print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
-				print '"' . length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) . '"' . $sep;
-				print "  " . $sep;
+			foreach ($tabbq[$key] as $k => $mt) {
+				print '"'.$journal.'"'.$sep;
+				print '"'.$date.'"'.$sep;
+				print '"'.$val["type_payment"].'"'.$sep;
+				print '"'.length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE).'"'.$sep;
+				print '"'.length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE).'"'.$sep;
+				print "  ".$sep;
 				if ($companystatic->name == '') {
-					print '"' . $val['bank_account_ref'] . ' - ' . utf8_decode($reflabel) . '"' . $sep;
+					print '"'.$val['bank_account_ref'].' - '.utf8_decode($reflabel).'"'.$sep;
 				} else {
-					print '"' . $val['bank_account_ref'] . ' - ' . utf8_decode($companystatic->name) . '"' . $sep;
+					print '"'.$val['bank_account_ref'].' - '.utf8_decode($companystatic->name).'"'.$sep;
 				}
-				print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep;
-				print '"' . ($mt >= 0 ? price($mt) : '') . '"';
+				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+				print '"'.($mt >= 0 ? price($mt) : '').'"';
 				print "\n";
 			}
 		}
@@ -755,25 +755,25 @@ 
 
 	llxHeader('', $langs->trans("FinanceJournal"));
 
-	$nom = $langs->trans("FinanceJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
-	$builddate=dol_now();
+	$nom = $langs->trans("FinanceJournal").' - '.$accountingjournalstatic->getNomUrl(1);
+	$builddate = dol_now();
 	//$description = $langs->trans("DescFinanceJournal") . '<br>';
-	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
+	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
-	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices = array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1).' - '.$form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1).' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
-	$varlink = 'id_journal=' . $id_journal;
+	$varlink = 'id_journal='.$id_journal;
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
 
 	// Test that setup is complete
-	$sql='SELECT COUNT(rowid) as nb FROM '.MAIN_DB_PREFIX.'bank_account WHERE fk_accountancy_journal IS NULL';
-	$resql=$db->query($sql);
+	$sql = 'SELECT COUNT(rowid) as nb FROM '.MAIN_DB_PREFIX.'bank_account WHERE fk_accountancy_journal IS NULL';
+	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$obj=$db->fetch_object($resql);
+		$obj = $db->fetch_object($resql);
 		if ($obj->nb > 0)
 		{
 			print '<br>'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
@@ -793,8 +793,8 @@ 
 
 
 	print '<div class="tabsAction tabsActionNoBottom">';
-	print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
-	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
+	print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+	print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	print '</div>';
 
 	// TODO Avoid using js. We can use a direct link with $param
@@ -824,32 +824,32 @@ 
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
-	print "<td>" . $langs->trans("Date") . "</td>";
-	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("ObjectsRef") . ")</td>";
-	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
-	print "<td>" . $langs->trans("PaymentMode") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
-	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<td>".$langs->trans("Date")."</td>";
+	print "<td>".$langs->trans("Piece").' ('.$langs->trans("ObjectsRef").")</td>";
+	print "<td>".$langs->trans("AccountAccounting")."</td>";
+	print "<td>".$langs->trans("SubledgerAccount")."</td>";
+	print "<td>".$langs->trans("LabelOperation")."</td>";
+	print "<td>".$langs->trans("PaymentMode")."</td>";
+	print "<td align='right'>".$langs->trans("Debit")."</td>";
+	print "<td align='right'>".$langs->trans("Credit")."</td>";
 	print "</tr>\n";
 
 	$r = '';
 
-	foreach ( $tabpay as $key => $val ) {	  // $key is rowid in llx_bank
+	foreach ($tabpay as $key => $val) {	  // $key is rowid in llx_bank
 		$date = dol_print_date($db->jdate($val["date"]), 'day');
 
 		$ref = getSourceDocRef($val, $tabtype[$key]);
 
 		// Bank
-		foreach ( $tabbq[$key] as $k => $mt )
+		foreach ($tabbq[$key] as $k => $mt)
 		{
 			//var_dump($tabpay[$key]);
 			print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
 			print '<tr class="oddeven">';
 			print "<td></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $ref . "</td>";
+			print "<td>".$date."</td>";
+			print "<td>".$ref."</td>";
 			// Ledger account
 			print "<td>";
 			$accounttoshow = length_accountg($k);
@@ -872,25 +872,25 @@ 
 			//var_dump($tabpay[$key]);
 			print $langs->trans("Bank");
 			print ' '.$val['bank_account_ref'];
-			if (! empty($val['soclib'])) {
-				print  " - " . $val['soclib'];
+			if (!empty($val['soclib'])) {
+				print  " - ".$val['soclib'];
 			}
 			print "</td>";
-			print "<td>" . $val["type_payment"] . "</td>";
-			print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
-			print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
+			print "<td>".$val["type_payment"]."</td>";
+			print "<td align='right'>".($mt >= 0 ? price($mt) : '')."</td>";
+			print "<td align='right'>".($mt < 0 ? price(-$mt) : '')."</td>";
 			print "</tr>";
 		}
 
 		// Third party
 		if (is_array($tabtp[$key])) {
-			foreach ( $tabtp[$key] as $k => $mt ) {
+			foreach ($tabtp[$key] as $k => $mt) {
 				if ($k != 'type') {
 					print '<!-- Thirdparty bank.rowid='.$key.' -->';
 					print '<tr class="oddeven">';
 					print "<td></td>";
-					print "<td>" . $date . "</td>";
-					print "<td>" . $ref . "</td>";
+					print "<td>".$date."</td>";
+					print "<td>".$ref."</td>";
 					// Ledger account
 					print "<td>";
 					$account_ledger = $k;
@@ -906,17 +906,17 @@ 
 						if ($tabtype[$key] == 'unknown')
 						{
 							// We will accept writing, but into a waiting account
-							print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>';	// We will a waiting account
+							print '<span class="warning">'.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).'</span>'; // We will a waiting account
 						}
 						else
 						{
 							// We will refuse writing
-							$errorstring='UnknownAccountForThirdpartyBlocking';
-							if ($tabtype[$key] == 'payment') $errorstring='MainAccountForCustomersNotDefined';
-							if ($tabtype[$key] == 'payment_supplier') $errorstring='MainAccountForSuppliersNotDefined';
-							if ($tabtype[$key] == 'payment_expensereport') $errorstring='MainAccountForUsersNotDefined';
-							if ($tabtype[$key] == 'payment_salary') $errorstring='MainAccountForUsersNotDefined';
-							if ($tabtype[$key] == 'payment_vat') $errorstring='MainAccountForVatPaymentNotDefined';
+							$errorstring = 'UnknownAccountForThirdpartyBlocking';
+							if ($tabtype[$key] == 'payment') $errorstring = 'MainAccountForCustomersNotDefined';
+							if ($tabtype[$key] == 'payment_supplier') $errorstring = 'MainAccountForSuppliersNotDefined';
+							if ($tabtype[$key] == 'payment_expensereport') $errorstring = 'MainAccountForUsersNotDefined';
+							if ($tabtype[$key] == 'payment_salary') $errorstring = 'MainAccountForUsersNotDefined';
+							if ($tabtype[$key] == 'payment_vat') $errorstring = 'MainAccountForVatPaymentNotDefined';
 							print '<span class="error">'.$langs->trans($errorstring).'</span>';
 						}
 					}
@@ -941,20 +941,20 @@ 
 						}
 					}
 					print "</td>";
-					print "<td>" . $reflabel . ' ' . $val['soclib'] . "</td>";
-					print "<td>" . $val["type_payment"] . "</td>";
-					print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
-					print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+					print "<td>".$reflabel.' '.$val['soclib']."</td>";
+					print "<td>".$val["type_payment"]."</td>";
+					print "<td align='right'>".($mt < 0 ? price(-$mt) : '')."</td>";
+					print "<td align='right'>".($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
 				}
 			}
 		} else {
-			foreach ( $tabbq[$key] as $k => $mt ) {
+			foreach ($tabbq[$key] as $k => $mt) {
 				print '<!-- Wait bank.rowid='.$key.' -->';
 				print '<tr class="oddeven">';
 				print "<td></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $ref . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$ref."</td>";
 				// Ledger account
 				print "<td>";
 				/*if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
@@ -972,10 +972,10 @@ 
 				else print length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE);
 				*/
 				print "</td>";
-				print "<td>" . $reflabel . "</td>";
-				print "<td>" . $val["type_payment"] . "</td>";
-				print "<td align='right'>" . ($mt < 0 ? price(- $mt) : '') . "</td>";
-				print "<td align='right'>" . ($mt >= 0 ? price($mt) : '') . "</td>";
+				print "<td>".$reflabel."</td>";
+				print "<td>".$val["type_payment"]."</td>";
+				print "<td align='right'>".($mt < 0 ? price(-$mt) : '')."</td>";
+				print "<td align='right'>".($mt >= 0 ? price($mt) : '')."</td>";
 				print "</tr>";
 			}
 		}
@@ -1026,19 +1026,19 @@ 
 	if ($reflabel == '(payment_salary)') {
 		$reflabel = $langs->trans('Employee');
 	}
-	$ref=$reflabel;
+	$ref = $reflabel;
 	if ($typerecord == 'payment')
 	{
 		$sqlmid = 'SELECT payfac.fk_facture as id, f.facnumber as ref';
 		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiement_facture as payfac, ".MAIN_DB_PREFIX."facture as f";
-		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=" . $val["paymentid"];
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$sqlmid .= " WHERE payfac.fk_facture = f.rowid AND payfac.fk_paiement=".$val["paymentid"];
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
-			$ref=$langs->trans("Invoice");
+			$ref = $langs->trans("Invoice");
 			while ($objmid = $db->fetch_object($resultmid))
 			{
-				$ref.=' '.$objmid->ref;
+				$ref .= ' '.$objmid->ref;
 			}
 		}
 		else dol_print_error($db);
@@ -1046,15 +1046,15 @@ 
 	elseif ($typerecord == 'payment_supplier')
 	{
 		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
-		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=" . $val["paymentsupplierid"];
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
+		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".$val["paymentsupplierid"];
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
-			$ref=$langs->trans("SupplierInvoice");
-			while($objmid = $db->fetch_object($resultmid))
+			$ref = $langs->trans("SupplierInvoice");
+			while ($objmid = $db->fetch_object($resultmid))
 			{
-				$ref.=' '.$objmid->ref;
+				$ref .= ' '.$objmid->ref;
 			}
 		}
 		else dol_print_error($db);
@@ -1062,15 +1062,15 @@ 
 	elseif ($typerecord == 'payment_expensereport')
 	{
 		$sqlmid = 'SELECT e.rowid as id, e.ref';
-		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_expensereport as pe, " . MAIN_DB_PREFIX . "expensereport as e";
-		$sqlmid .= " WHERE pe.rowid=" . $val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
+		$sqlmid .= " WHERE pe.rowid=".$val["paymentexpensereport"]." AND pe.fk_expensereport = e.rowid";
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
-			$ref=$langs->trans("ExpenseReport");
-			while($objmid = $db->fetch_object($resultmid))
+			$ref = $langs->trans("ExpenseReport");
+			while ($objmid = $db->fetch_object($resultmid))
 			{
-				$ref.=' '.$objmid->ref;
+				$ref .= ' '.$objmid->ref;
 			}
 		}
 		else dol_print_error($db);
@@ -1078,15 +1078,15 @@ 
 	elseif ($typerecord == 'payment_salary')
 	{
 		$sqlmid = 'SELECT s.rowid as ref';
-		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_salary as s";
-		$sqlmid .= " WHERE s.rowid=" . $val["paymentsalid"];
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
+		$sqlmid .= " WHERE s.rowid=".$val["paymentsalid"];
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
-			$ref=$langs->trans("SalaryPayment");
+			$ref = $langs->trans("SalaryPayment");
 			while ($objmid = $db->fetch_object($resultmid))
 			{
-				$ref.=' '.$objmid->ref;
+				$ref .= ' '.$objmid->ref;
 			}
 		}
 		else dol_print_error($db);
@@ -1094,15 +1094,15 @@ 
 	elseif ($typerecord == 'payment_vat')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
-		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "tva as v";
-		$sqlmid .= " WHERE v.rowid=" . $val["paymentvatid"];
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
+		$sqlmid .= " WHERE v.rowid=".$val["paymentvatid"];
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
-			$ref=$langs->trans("PaymentVat");
+			$ref = $langs->trans("PaymentVat");
 			while ($objmid = $db->fetch_object($resultmid))
 			{
-				$ref.=' '.$objmid->ref;
+				$ref .= ' '.$objmid->ref;
 			}
 		}
 		else dol_print_error($db);
@@ -1110,15 +1110,15 @@ 
 	elseif ($typerecord == 'payment_donation')
 	{
 		$sqlmid = 'SELECT payd.fk_donation as ref';
-		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_donation as payd";
-		$sqlmid .= " WHERE payd.fk_donation=" . $val["paymentdonationid"];
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
+		$sqlmid .= " WHERE payd.fk_donation=".$val["paymentdonationid"];
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
-			$ref=$langs->trans("Donation").' ';
+			$ref = $langs->trans("Donation").' ';
 			while ($objmid = $db->fetch_object($resultmid))
 			{
-				$ref.=' '.$objmid->ref;
+				$ref .= ' '.$objmid->ref;
 			}
 		}
 		else dol_print_error($db);
@@ -1126,15 +1126,15 @@ 
 	elseif ($typerecord == 'payment_various')
 	{
 		$sqlmid = 'SELECT v.rowid as ref';
-		$sqlmid .= " FROM " . MAIN_DB_PREFIX . "payment_various as v";
-		$sqlmid .= " WHERE v.rowid=" . $val["paymentvariousid"];
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG);
+		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+		$sqlmid .= " WHERE v.rowid=".$val["paymentvariousid"];
+		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
 		$resultmid = $db->query($sqlmid);
 		if ($resultmid) {
-			$ref=$langs->trans("VariousPayment");
+			$ref = $langs->trans("VariousPayment");
 			while ($objmid = $db->fetch_object($resultmid))
 			{
-				$ref.=' '.$objmid->ref;
+				$ref .= ' '.$objmid->ref;
 			}
 		}
 		else dol_print_error($db);

htdocs/accountancy/journal/expensereportsjournal.php

Spacing +100 added lines, -100 removed lines

@@ -27,19 +27,19 @@ 
  * \brief		Page with expense reports journal
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 
-$langs->loadLangs(array("commercial", "compta","bills","other","accountancy","trips","errors"));
+$langs->loadLangs(array("commercial", "compta", "bills", "other", "accountancy", "trips", "errors"));
 
 $id_journal = GETPOST('id_journal', 'int');
-$action = GETPOST('action','aZ09');
+$action = GETPOST('action', 'aZ09');
 
 $date_startmonth = GETPOST('date_startmonth');
 $date_startday = GETPOST('date_startday');
@@ -71,7 +71,7 @@ 
 $pastmonthyear = $year_current;
 if ($pastmonth == 0) {
 	$pastmonth = 12;
-	$pastmonthyear --;
+	$pastmonthyear--;
 }
 
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
@@ -90,59 +90,59 @@ 
 $sql .= " u.rowid as uid, u.firstname, u.lastname, u.accountancy_code as user_accountancy_account,";
 $sql .= " f.accountancy_code, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte";
 //$sql .= " ct.accountancy_code_buy as account_tva";
-$sql .= " FROM " . MAIN_DB_PREFIX . "expensereport_det as erd";
+$sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as erd";
 //$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON erd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_type_fees as f ON f.id = erd.fk_c_type_fees";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "expensereport as er ON er.rowid = erd.fk_expensereport";
-$sql .= " JOIN " . MAIN_DB_PREFIX . "user as u ON u.rowid = er.fk_user_author";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = erd.fk_code_ventilation";
+$sql .= " JOIN ".MAIN_DB_PREFIX."expensereport as er ON er.rowid = erd.fk_expensereport";
+$sql .= " JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0";
 $sql .= " AND erd.fk_code_ventilation > 0";
-$sql .= " AND er.entity IN (" . getEntity('expensereport', 0) . ")";  // We don't share object for accountancy
+$sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 if ($date_start && $date_end)
-	$sql .= " AND er.date_debut >= '" . $db->idate($date_start) . "' AND er.date_debut <= '" . $db->idate($date_end) . "'";
+	$sql .= " AND er.date_debut >= '".$db->idate($date_start)."' AND er.date_debut <= '".$db->idate($date_end)."'";
 if ($in_bookkeeping == 'already')
-    $sql .= " AND er.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+    $sql .= " AND er.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 if ($in_bookkeeping == 'notyet')
-    $sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
+    $sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 $sql .= " ORDER BY er.date_debut";
 
 dol_syslog('accountancy/journal/expensereportsjournal.php', LOG_DEBUG);
 $result = $db->query($sql);
 if ($result) {
 
-	$taber = array ();
-	$tabht = array ();
-	$tabtva = array ();
-	$def_tva = array ();
-	$tabttc = array ();
-	$tablocaltax1 = array ();
-	$tablocaltax2 = array ();
-	$tabuser = array ();
+	$taber = array();
+	$tabht = array();
+	$tabtva = array();
+	$def_tva = array();
+	$tabttc = array();
+	$tablocaltax1 = array();
+	$tablocaltax2 = array();
+	$tabuser = array();
 
 	$num = $db->num_rows($result);
 
 	// Variables
-	$account_salary = (! empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined';
-	$account_vat = (! empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
+	$account_salary = (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT)) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined';
+	$account_vat = (!empty($conf->global->ACCOUNTING_VAT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_VAT_BUY_ACCOUNT : 'NotDefined';
 
 	$i = 0;
-	while ( $i < $num ) {
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
 		// Controls
-		$compta_user = (! empty($obj->user_accountancy_account)) ? $obj->user_accountancy_account : $account_salary;
+		$compta_user = (!empty($obj->user_accountancy_account)) ? $obj->user_accountancy_account : $account_salary;
 		$compta_fees = $obj->compte;
 
-		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code?' ('.$obj->vat_src_code.')':''), $mysoc, $mysoc, 0);
-		$compta_tva = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
-		$compta_localtax1 = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
-		$compta_localtax2 = (! empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+		$vatdata = getTaxesFromId($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), $mysoc, $mysoc, 0);
+		$compta_tva = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $account_vat);
+		$compta_localtax1 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
+		$compta_localtax2 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || ! empty($obj->vat_src_code))
+		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code))
 		{
-			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':'')]=(vatrate($obj->tva_tx).($obj->vat_src_code?' ('.$obj->vat_src_code.')':''));
+			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
 		$taber[$obj->rowid]["date"] = $db->jdate($obj->de);
@@ -151,24 +151,24 @@ 
 		$taber[$obj->rowid]["fk_expensereportdet"] = $obj->erdid;
 
 		// Avoid warnings
-		if (! isset($tabttc[$obj->rowid][$compta_user])) $tabttc[$obj->rowid][$compta_user] = 0;
-		if (! isset($tabht[$obj->rowid][$compta_fees])) $tabht[$obj->rowid][$compta_fees] = 0;
-		if (! isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (! isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (! isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_user])) $tabttc[$obj->rowid][$compta_user] = 0;
+		if (!isset($tabht[$obj->rowid][$compta_fees])) $tabht[$obj->rowid][$compta_fees] = 0;
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
 
 		$tabttc[$obj->rowid][$compta_user] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_fees] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
-		$tabuser[$obj->rowid] = array (
+		$tabuser[$obj->rowid] = array(
 				'id' => $obj->uid,
 				'name' => dolGetFirstLastname($obj->firstname, $obj->lastname),
 				'user_accountancy_code' => $obj->user_accountancy_account
 		);
 
-		$i ++;
+		$i++;
 	}
 } else {
 	dol_print_error($db);
@@ -186,9 +186,9 @@ 
 		$db->begin();
 
 		// Thirdparty
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabttc[$key] as $k => $mt ) {
+			foreach ($tabttc[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
 					$bookkeeping->doc_date = $val["date"];
@@ -229,9 +229,9 @@ 
 		}
 
 		// Fees
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			foreach ( $tabht[$key] as $k => $mt ) {
+			foreach ($tabht[$key] as $k => $mt) {
 				if ($mt) {
 					// get compte id and label
 					$accountingaccount = new AccountingAccount($db);
@@ -276,16 +276,16 @@ 
 		}
 
 		// VAT
-		if (! $errorforline)
+		if (!$errorforline)
 		{
-			$listoftax=array(0, 1, 2);
-			foreach($listoftax as $numtax)
+			$listoftax = array(0, 1, 2);
+			foreach ($listoftax as $numtax)
 			{
 				$arrayofvat = $tabtva;
 				if ($numtax == 1) $arrayofvat = $tablocaltax1;
 				if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-				foreach ( $arrayofvat[$key] as $k => $mt ) {
+				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
 					// get compte id and label
 					$bookkeeping = new BookKeeping($db);
@@ -298,7 +298,7 @@ 
 					$bookkeeping->subledger_account = '';
 					$bookkeeping->subledger_label = '';
 					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_operation = $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %';
+					$bookkeeping->label_operation = $langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %';
 					$bookkeeping->montant = $mt;
 					$bookkeeping->sens = ($mt < 0) ? 'C' : 'D';
 					$bookkeeping->debit = ($mt > 0) ? $mt : 0;
@@ -327,7 +327,7 @@ 
 			}
 		}
 
-		if (! $errorforline)
+		if (!$errorforline)
 		{
 			$db->commit();
 		}
@@ -338,7 +338,7 @@ 
 			if ($error >= 10)
 			{
 			    setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
-			    break;  // Break in the foreach
+			    break; // Break in the foreach
 			}
 		}
 	}
@@ -355,20 +355,20 @@ 
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
 	}
 
-	$action='';
+	$action = '';
 
 	// Must reload data, so we make a redirect
 	if (count($tabpay) != $error)
 	{
-		$param='id_journal='.$id_journal;
-		$param.='&date_startday='.$date_startday;
-		$param.='&date_startmonth='.$date_startmonth;
-		$param.='&date_startyear='.$date_startyear;
-		$param.='&date_endday='.$date_endday;
-		$param.='&date_endmonth='.$date_endmonth;
-		$param.='&date_endyear='.$date_endyear;
-		$param.='&in_bookeeping='.$in_bookeeping;
-		header("Location: ".$_SERVER['PHP_SELF'].($param?'?'.$param:''));
+		$param = 'id_journal='.$id_journal;
+		$param .= '&date_startday='.$date_startday;
+		$param .= '&date_startmonth='.$date_startmonth;
+		$param .= '&date_startyear='.$date_startyear;
+		$param .= '&date_endday='.$date_endday;
+		$param .= '&date_endmonth='.$date_endmonth;
+		$param .= '&date_endyear='.$date_endyear;
+		$param .= '&in_bookeeping='.$in_bookeeping;
+		header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
 		exit;
 	}
 }
@@ -494,17 +494,17 @@ 
 
 	llxHeader('', $langs->trans("ExpenseReportsJournal"));
 
-	$nom = $langs->trans("ExpenseReportsJournal") . ' - ' . $accountingjournalstatic->getNomUrl(1);
+	$nom = $langs->trans("ExpenseReportsJournal").' - '.$accountingjournalstatic->getNomUrl(1);
 	$nomlink = '';
 	$periodlink = '';
 	$exportlink = '';
-	$builddate=dol_now();
-	$description.= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
+	$builddate = dol_now();
+	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
 
-	$listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
-	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' -  ' .$langs->trans("AlreadyInGeneralLedger").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+	$listofchoices = array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger"));
+	$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1).' - '.$form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1).' -  '.$langs->trans("AlreadyInGeneralLedger").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
 
-	$varlink = 'id_journal=' . $id_journal;
+	$varlink = 'id_journal='.$id_journal;
 
 	journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
 
@@ -515,10 +515,10 @@ 
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
-	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="' . $langs->trans("WriteBookKeeping") . '" />';
+	    print '<input type="button" class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	}
 	else {
-	   print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	   print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
 	}
 	//print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
 	print '</div>';
@@ -548,13 +548,13 @@ 
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
 	print "<td></td>";
-	print "<td>" . $langs->trans("Date") . "</td>";
-	print "<td>" . $langs->trans("Piece") . ' (' . $langs->trans("ExpenseReportRef") . ")</td>";
-	print "<td>" . $langs->trans("AccountAccounting") . "</td>";
-	print "<td>" . $langs->trans("SubledgerAccount") . "</td>";
-	print "<td>" . $langs->trans("LabelOperation") . "</td>";
-	print "<td align='right'>" . $langs->trans("Debit") . "</td>";
-	print "<td align='right'>" . $langs->trans("Credit") . "</td>";
+	print "<td>".$langs->trans("Date")."</td>";
+	print "<td>".$langs->trans("Piece").' ('.$langs->trans("ExpenseReportRef").")</td>";
+	print "<td>".$langs->trans("AccountAccounting")."</td>";
+	print "<td>".$langs->trans("SubledgerAccount")."</td>";
+	print "<td>".$langs->trans("LabelOperation")."</td>";
+	print "<td align='right'>".$langs->trans("Debit")."</td>";
+	print "<td align='right'>".$langs->trans("Credit")."</td>";
 	print "</tr>\n";
 
 	$r = '';
@@ -562,7 +562,7 @@ 
 	$expensereportstatic = new ExpenseReport($db);
 	$expensereportlinestatic = new ExpenseReportLine($db);
 
-	foreach ( $taber as $key => $val ) {
+	foreach ($taber as $key => $val) {
 		$expensereportstatic->id = $key;
 		$expensereportstatic->ref = $val["ref"];
 		$expensereportlinestatic->comments = html_entity_decode(dol_trunc($val["comments"], 32));
@@ -570,15 +570,15 @@ 
 		$date = dol_print_date($val["date"], 'day');
 
 		// Fees
-		foreach ( $tabht[$key] as $k => $mt ) {
+		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 
 			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- Fees --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$expensereportstatic->getNomUrl(1)."</td>";
 				$userstatic->id = $tabuser[$key]['id'];
 				$userstatic->name = $tabuser[$key]['name'];
 				// Account
@@ -595,19 +595,19 @@ 
 				print '</td>';
 				$userstatic->id = $tabuser[$key]['id'];
 				$userstatic->name = $tabuser[$key]['name'];
-				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $accountingaccount->label . "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$accountingaccount->label."</td>";
+				print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 		}
 
 		// Third party
-		foreach ( $tabttc[$key] as $k => $mt ) {
+		foreach ($tabttc[$key] as $k => $mt) {
 			print '<tr class="oddeven">';
 			print "<td><!-- Thirdparty --></td>";
-			print "<td>" . $date . "</td>";
-			print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
+			print "<td>".$date."</td>";
+			print "<td>".$expensereportstatic->getNomUrl(1)."</td>";
 			$userstatic->id = $tabuser[$key]['id'];
 			$userstatic->name = $tabuser[$key]['name'];
 			// Account
@@ -628,9 +628,9 @@ 
 			}
 			else print $accountoshow;
 			print '</td>';
-			print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("SubledgerAccount") . "</td>";
-			print '<td align="right">' . ($mt < 0 ? - price(- $mt) : '') . "</td>";
-			print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
+			print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("SubledgerAccount")."</td>";
+			print '<td align="right">'.($mt < 0 ? -price(-$mt) : '')."</td>";
+			print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
 		}
 
@@ -641,12 +641,12 @@ 
 			if ($numtax == 1) $arrayofvat = $tablocaltax1;
 			if ($numtax == 2) $arrayofvat = $tablocaltax2;
 
-			foreach ( $arrayofvat[$key] as $k => $mt ) {
+			foreach ($arrayofvat[$key] as $k => $mt) {
 			if ($mt) {
 				print '<tr class="oddeven">';
 				print "<td><!-- VAT --></td>";
-				print "<td>" . $date . "</td>";
-				print "<td>" . $expensereportstatic->getNomUrl(1) . "</td>";
+				print "<td>".$date."</td>";
+				print "<td>".$expensereportstatic->getNomUrl(1)."</td>";
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
@@ -659,10 +659,10 @@ 
 				// Subledger account
 				print "<td>";
 				print '</td>';
-				print "<td>" . $userstatic->getNomUrl(0, 'user', 16) . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:'');
+				print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("VAT").' '.join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '');
 				print "</td>";
-				print '<td align="right">' . ($mt >= 0 ? price($mt) : '') . "</td>";
-				print '<td align="right">' . ($mt < 0 ? price(- $mt) : '') . "</td>";
+				print '<td align="right">'.($mt >= 0 ? price($mt) : '')."</td>";
+				print '<td align="right">'.($mt < 0 ? price(-$mt) : '')."</td>";
 				print "</tr>";
 			}
 			}

htdocs/accountancy/bookkeeping/thirdparty_lettrage_supplier.php

Spacing +91 added lines, -91 removed lines

@@ -29,23 +29,23 @@ 
 // Dolibarr environment
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.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.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 
-$action=GETPOST('action','aZ09');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
+$action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -53,11 +53,11 @@ 
 if ($sortorder == "") $sortorder = "ASC";
 if ($sortfield == "") $sortfield = "bk.rowid";
 
-$search_year = GETPOST ( "search_year" );
+$search_year = GETPOST("search_year");
 
 
 // Security check
-$socid = GETPOST("socid",'int');
+$socid = GETPOST("socid", 'int');
 // if ($user->societe_id) $socid=$user->societe_id;
 
 $object = new Societe($db);
@@ -74,11 +74,11 @@ 
  */
 if ($action == 'lettering') {
 
-	$result =  $BookKeeping->updatelettrage($_POST['ids']);
+	$result = $BookKeeping->updatelettrage($_POST['ids']);
 
 // 	var_dump($result);
-	if( $result < 0 ){
-		setEventMessages('', $BookKeeping->errors, 'errors' );
+	if ($result < 0) {
+		setEventMessages('', $BookKeeping->errors, 'errors');
 		$error++;
 
 	}
@@ -88,8 +88,8 @@ 
 
 	$result = $BookKeeping->LettrageTiers($socid);
 
-	if( $result < 0 ){
-							setEventMessages('', $BookKeeping->errors, 'errors' );
+	if ($result < 0) {
+							setEventMessages('', $BookKeeping->errors, 'errors');
 							$error++;
 
 						}
@@ -97,7 +97,7 @@ 
 }
 
 
-llxHeader ( '', 'Compta - Grand Livre' );
+llxHeader('', 'Compta - Grand Livre');
 
 
 	/*
@@ -105,27 +105,27 @@ 
 	 */
 	$head = societe_prepare_head($object);
 
-	dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+	dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"), 0, 'company');
 
 
 
 
 	print '<table width="100%" class="border">';
 	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
-	$object->next_prev_filter="te.fournisseur = 1";
-	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
+	$object->next_prev_filter = "te.fournisseur = 1";
+	print $form->showrefnav($object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom', '', '');
 	print '</td></tr>';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
 
 
 		print '<tr>';
-        print '<td class="nowrap">'.$langs->trans("SupplierCode"). '</td><td colspan="3">';
+        print '<td class="nowrap">'.$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>';
@@ -134,28 +134,28 @@ 
 		$langs->load('compta');
         print '<tr>';
         print '<td>';
-        print $form->editfieldkey("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
+        print $form->editfieldkey("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
         print '</td><td colspan="3">';
-        print $form->editfieldval("SupplierAccountancyCode",'supplieraccountancycode',$object->code_compta_fournisseur,$object,$user->rights->societe->creer);
+        print $form->editfieldval("SupplierAccountancyCode", 'supplieraccountancycode', $object->code_compta_fournisseur, $object, $user->rights->societe->creer);
         print '</td>';
         print '</tr>';
 
 
 	// Address
 	print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">';
-	dol_print_address($object->address,'gmap','thirdparty',$object->id);
+	dol_print_address($object->address, 'gmap', 'thirdparty', $object->id);
 	print '</td></tr>';
 
 	// Zip / Town
-	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>';
+	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town) ? ' / ' : '').$object->town.'</td>';
 	print '</tr>';
 
 	// Country
 	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
 	//$img=picto_from_langcode($object->country_code);
-	$img='';
-	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
-	else print ($img?$img.' ':'').$object->country;
+	$img = '';
+	if ($object->isInEEC()) print $form->textwithpicto(($img ? $img.' ' : '').$object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+	else print ($img ? $img.' ' : '').$object->country;
 	print '</td></tr>';
 
 	print '</table>';
@@ -173,23 +173,23 @@ 
  */
 
 	$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering ";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
-	$sql .= " WHERE (bk.code_tiers =  '" . $object->code_compta_fournisseur . "' AND bk.numero_compte = '" .$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER. "' )" ;
+	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
+	$sql .= " WHERE (bk.code_tiers =  '".$object->code_compta_fournisseur."' AND bk.numero_compte = '".$conf->global->ACCOUNTING_ACCOUNT_SUPPLIER."' )";
 
 
 
-	if (dol_strlen ( $search_year  )) {
-		$sql .= " AND ( bk.doc_date BETWEEN  '" . $search_year . "-0-0' AND  '" . ($search_year+1). "-0-0' )";
+	if (dol_strlen($search_year)) {
+		$sql .= " AND ( bk.doc_date BETWEEN  '".$search_year."-0-0' AND  '".($search_year + 1)."-0-0' )";
 	}
 
 
-	$sql .= " ORDER BY bk.lettering ASC, bk.doc_date ASC" ;//. $db->plimit ( $conf->liste_limit + 1, $offset );
+	$sql .= " ORDER BY bk.lettering ASC, bk.doc_date ASC"; //. $db->plimit ( $conf->liste_limit + 1, $offset );
 
 // 	echo $sql;
 // 	dol_syslog ( "bookkeping:liste:create sql=" . $sql, LOG_DEBUG );
-	$resql = $db->query ( $sql );
+	$resql = $db->query($sql);
 	if ($resql) {
-		$num = $db->num_rows ( $resql );
+		$num = $db->num_rows($resql);
 		$i = 0;
 
 
@@ -200,27 +200,27 @@ 
 		print "<table class=\"noborder\" width=\"100%\">";
 		print '<tr class="liste_titre">';
 			print '<td></td>';
-		print_liste_field_titre("Doctype", "liste.php", "bk.doc_type" );
-		print_liste_field_titre("Docdate", "liste.php", "bk.doc_date" );
-		print_liste_field_titre("Docref", "liste.php", "bk.doc_ref" );
+		print_liste_field_titre("Doctype", "liste.php", "bk.doc_type");
+		print_liste_field_titre("Docdate", "liste.php", "bk.doc_date");
+		print_liste_field_titre("Docref", "liste.php", "bk.doc_ref");
 // 		print_liste_field_titre("Numerocompte", "liste.php", "bk.numero_compte" );
 // 		print_liste_field_titre("Code_tiers", "liste.php", "bk.code_tiers" );
-		print_liste_field_titre("LabelAccount", "liste.php", "bk_label_compte" );
-		print_liste_field_titre("Debit", "liste.php", "bk.debit" );
-		print_liste_field_titre("Credit", "liste.php", "bk.credit" );
-		print_liste_field_titre("Amount", "liste.php", "bk.montant" );
-		print_liste_field_titre("Sens", "liste.php", "bk.sens" );
-		print_liste_field_titre("Codejournal", "liste.php", "bk.code_journal" );
+		print_liste_field_titre("LabelAccount", "liste.php", "bk_label_compte");
+		print_liste_field_titre("Debit", "liste.php", "bk.debit");
+		print_liste_field_titre("Credit", "liste.php", "bk.credit");
+		print_liste_field_titre("Amount", "liste.php", "bk.montant");
+		print_liste_field_titre("Sens", "liste.php", "bk.sens");
+		print_liste_field_titre("Codejournal", "liste.php", "bk.code_journal");
 		print '<td></td>';
 		print '<td></td>';
 		print "</tr>\n";
 
 		print '<tr class="liste_titre">';
 		print '<form action="" method="GET">';
-		print '<input type="hidden" name="socid" value="' . $_GET ["socid"] . '">';
-		print '<td><input type="text" name="search_doc_type" value="' . $_GET ["search_doc_type"] . '"></td>';
-		print '<td><input type="text" name="search_year" value="' . $_GET ["search_year"] . '"></td>';
-		print '<td><input type="text" name="search_doc_refe" value="' . $_GET ["search_doc_ref"] . '"></td>';
+		print '<input type="hidden" name="socid" value="'.$_GET ["socid"].'">';
+		print '<td><input type="text" name="search_doc_type" value="'.$_GET ["search_doc_type"].'"></td>';
+		print '<td><input type="text" name="search_year" value="'.$_GET ["search_year"].'"></td>';
+		print '<td><input type="text" name="search_doc_refe" value="'.$_GET ["search_doc_ref"].'"></td>';
 // 		print '<td><input type="text" name="search_compte" value="' . $_GET ["search_compte"] . '"></td>';
 // 		print '<td><input type="text" name="search_tiers" value="' . $_GET ["search_tiers"] . '"></td>';
 		print '<td>&nbsp;</td>';
@@ -229,7 +229,7 @@ 
 		print '<td>&nbsp;</td>';
 		print '<td>&nbsp;</td>';
 		print '<td align="right">';
-		print '<input type="image" class="liste_titre" name="button_search" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '" title="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '">';
+		print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 		print '</td>';
 		print '<td>&nbsp;</td>';
 		print '<td>&nbsp;</td>';
@@ -243,64 +243,64 @@ 
 		$credit = 0;
 		$solde = 0;
 		$tmp = '';
-		while ( $i < $num ) {
-			$obj = $db->fetch_object ( $resql );
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
 
-			if($tmp !=$obj->lettering || empty($tmp) )
-				$tmp =$obj->lettering;
+			if ($tmp != $obj->lettering || empty($tmp))
+				$tmp = $obj->lettering;
 
-			if($tmp !=$obj->lettering || empty($obj->lettering))
-				$var = ! $var;
+			if ($tmp != $obj->lettering || empty($obj->lettering))
+				$var = !$var;
 
 
-			$debit+= $obj->debit;
-			$credit+= $obj->credit;
+			$debit += $obj->debit;
+			$credit += $obj->credit;
 
-			$solde+=($obj->credit-$obj->debit);
+			$solde += ($obj->credit - $obj->debit);
 			print "<tr $bc[$var]>";
 
-			print '<td>' . $obj->rowid . '</td>';
-			if(empty($obj->lettering)){
-				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num=' . $obj->piece_num . '">';
-				print img_edit ();
-				print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
+			print '<td>'.$obj->rowid.'</td>';
+			if (empty($obj->lettering)) {
+				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num='.$obj->piece_num.'">';
+				print img_edit();
+				print '</a>&nbsp;'.$obj->doc_type.'</td>'."\n";
 			}
 			else
-				print '<td>'.$obj->doc_type . '</td>' . "\n";
+				print '<td>'.$obj->doc_type.'</td>'."\n";
 
 
 
-			print '<td>' . dol_print_date ( $db->jdate ( $obj->doc_date ), 'day' ) . '</td>';
-			print '<td>' . $obj->doc_ref . '</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->doc_date), 'day').'</td>';
+			print '<td>'.$obj->doc_ref.'</td>';
 // 			print '<td>' . $obj->numero_compte . '</td>';
 // 			print '<td>' . $obj->code_tiers . '</td>';
-			print '<td>' . $obj->label_compte . '</td>';
-			print '<td>' . $obj->debit . '</td>';
-			print '<td>' . $obj->credit . '</td>';
-			print '<td>' . $obj->montant . '</td>';
-			print '<td>' . $obj->sens . '</td>';
-			print '<td>' . $obj->code_journal . '</td>';
-			print '<td>' . round($solde, 2) . '</td>';
-
-			if(empty($obj->lettering)){
-				print '<td><input type="checkbox" name="ids[]" value="' . $obj->rowid . '" /></td>';
+			print '<td>'.$obj->label_compte.'</td>';
+			print '<td>'.$obj->debit.'</td>';
+			print '<td>'.$obj->credit.'</td>';
+			print '<td>'.$obj->montant.'</td>';
+			print '<td>'.$obj->sens.'</td>';
+			print '<td>'.$obj->code_journal.'</td>';
+			print '<td>'.round($solde, 2).'</td>';
+
+			if (empty($obj->lettering)) {
+				print '<td><input type="checkbox" name="ids[]" value="'.$obj->rowid.'" /></td>';
 			}
 			else
-				print '<td>' . $obj->lettering . '</td>';
+				print '<td>'.$obj->lettering.'</td>';
 
 			print "</tr>\n";
 
-			$i ++;
+			$i++;
 		}
 
 			print '<tr class="oddeven">';
 
-			print '<td colspan="4">Mouvement totaux</td>' . "\n";
+			print '<td colspan="4">Mouvement totaux</td>'."\n";
 			print '<td></td>';
 			print '<td></td>';
 			print '<td></td>';
-			print '<td><strong>' . $debit . '</strong></td>';
-			print '<td><strong>' . $credit . '</strong></td>';
+			print '<td><strong>'.$debit.'</strong></td>';
+			print '<td><strong>'.$credit.'</strong></td>';
 			print '<td></td>';
 			print '<td></td>';
 			print '<td></td>';
@@ -308,11 +308,11 @@ 
 			print "</tr>\n";
 
 			print "<tr $bc[$var]>";
-			print '<td colspan="5">Solde Comptable</td>' . "\n";
+			print '<td colspan="5">Solde Comptable</td>'."\n";
 			print '<td></td>';
 			print '<td></td>';
 			print '<td></td>';
-			print '<td><strong>' . ($credit-$debit) . '</strong></td>';
+			print '<td><strong>'.($credit - $debit).'</strong></td>';
 			print '<td></td>';
 			print '<td></td>';
 			print '<td></td>';
@@ -324,9 +324,9 @@ 
 		print '<input class="butAction" type="submit" value="lettering">';
 		print '<a class="butAction" href="?socid='.$object->id.'&action=autolettrage">auto lettering</a>';
 		print "</form>";
-		$db->free ( $resql );
+		$db->free($resql);
 	} else {
-		dol_print_error ( $db );
+		dol_print_error($db);
 	}
 
 

htdocs/accountancy/bookkeeping/thirdparty_lettrage.php

Spacing +85 added lines, -85 removed lines

@@ -28,22 +28,22 @@ 
 
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-
-$action=GETPOST('action','aZ09');
-$massaction=GETPOST('massaction','alpha');
-$show_files=GETPOST('show_files','int');
-$confirm=GETPOST('confirm','alpha');
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+$action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha');
+$show_files = GETPOST('show_files', 'int');
+$confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -51,10 +51,10 @@ 
 if ($sortorder == "") $sortorder = "ASC";
 if ($sortfield == "") $sortfield = "bk.rowid";
 
-$search_year = GETPOST ( "search_year" );
+$search_year = GETPOST("search_year");
 
 // Security check
-$socid = GETPOST("socid",'int');
+$socid = GETPOST("socid", 'int');
 // if ($user->societe_id) $socid=$user->societe_id;
 
 $object = new Societe($db);
@@ -73,11 +73,11 @@ 
 
 if ($action == 'lettering') {
 
-	$result =  $BookKeeping->updatelettrage($_POST['ids']);
+	$result = $BookKeeping->updatelettrage($_POST['ids']);
 
 // 	var_dump($result);
-	if( $result < 0 ){
-		setEventMessages('', $BookKeeping->errors, 'errors' );
+	if ($result < 0) {
+		setEventMessages('', $BookKeeping->errors, 'errors');
 		$error++;
 
 	}
@@ -87,8 +87,8 @@ 
 
 	$result = $BookKeeping->LettrageTiers($socid);
 
-	if( $result < 0 ){
-							setEventMessages('', $BookKeeping->errors, 'errors' );
+	if ($result < 0) {
+							setEventMessages('', $BookKeeping->errors, 'errors');
 							$error++;
 
 						}
@@ -96,7 +96,7 @@ 
 }
 
 
-llxHeader ( '', 'Compta - Grand Livre' );
+llxHeader('', 'Compta - Grand Livre');
 
 
 	/*
@@ -104,27 +104,27 @@ 
 	 */
 	$head = societe_prepare_head($object);
 
-	dol_htmloutput_mesg(is_numeric($error)?'':$error, $errors, 'error');
+	dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
 
-	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"),0,'company');
+	dol_fiche_head($head, 'TabAccounting', $langs->trans("ThirdParty"), 0, 'company');
 
 
 
 
 	print '<table width="100%" class="border">';
 	print '<tr><td width="30%">'.$langs->trans("ThirdPartyName").'</td><td width="70%" colspan="3">';
-	$object->next_prev_filter="te.fournisseur = 1";
-	print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','','');
+	$object->next_prev_filter = "te.fournisseur = 1";
+	print $form->showrefnav($object, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid', 'nom', '', '');
 	print '</td></tr>';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
     {
         print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
 
 
 		print '<tr>';
-        print '<td class="nowrap">'.$langs->trans("CustomerCode"). '</td><td colspan="3">';
+        print '<td class="nowrap">'.$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>';
@@ -133,28 +133,28 @@ 
 		$langs->load('compta');
         print '<tr>';
         print '<td>';
-        print $form->editfieldkey("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
+        print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer);
         print '</td><td colspan="3">';
-        print $form->editfieldval("CustomerAccountancyCode",'customeraccountancycode',$object->code_compta,$object,$user->rights->societe->creer);
+        print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer);
         print '</td>';
         print '</tr>';
 
 
 	// Address
 	print '<tr><td valign="top">'.$langs->trans("Address").'</td><td colspan="3">';
-	dol_print_address($object->address,'gmap','thirdparty',$object->id);
+	dol_print_address($object->address, 'gmap', 'thirdparty', $object->id);
 	print '</td></tr>';
 
 	// Zip / Town
-	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>';
+	print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town) ? ' / ' : '').$object->town.'</td>';
 	print '</tr>';
 
 	// Country
 	print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
 	//$img=picto_from_langcode($object->country_code);
-	$img='';
-	if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0);
-	else print ($img?$img.' ':'').$object->country;
+	$img = '';
+	if ($object->isInEEC()) print $form->textwithpicto(($img ? $img.' ' : '').$object->country, $langs->trans("CountryIsInEEC"), 1, 0);
+	else print ($img ? $img.' ' : '').$object->country;
 	print '</td></tr>';
 
 	print '</table>';
@@ -164,23 +164,23 @@ 
 
 
 	$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, bk.code_tiers, bk.numero_compte , bk.label_compte, bk.debit , bk.credit, bk.montant , bk.sens , bk.code_journal , bk.piece_num, bk.lettering_code ";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as bk";
-	$sql .= " WHERE (bk.code_tiers =  '" . $object->code_compta . "' AND bk.numero_compte = '" .$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER. "' )" ;
+	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
+	$sql .= " WHERE (bk.code_tiers =  '".$object->code_compta."' AND bk.numero_compte = '".$conf->global->ACCOUNTING_ACCOUNT_CUSTOMER."' )";
 
 
 
-	if (dol_strlen ( $search_year  )) {
-		$sql .= " AND ( bk.doc_date BETWEEN  '" . $search_year . "-0-0' AND  '" . ($search_year+1). "-0-0' )";
+	if (dol_strlen($search_year)) {
+		$sql .= " AND ( bk.doc_date BETWEEN  '".$search_year."-0-0' AND  '".($search_year + 1)."-0-0' )";
 	}
 
 
-	$sql .= " ORDER BY bk.lettering_code ASC, bk.doc_date ASC" ;//. $db->plimit ( $conf->liste_limit + 1, $offset );
+	$sql .= " ORDER BY bk.lettering_code ASC, bk.doc_date ASC"; //. $db->plimit ( $conf->liste_limit + 1, $offset );
 
 // 	echo $sql;
 // 	dol_syslog ( "bookkeping:liste:create sql=" . $sql, LOG_DEBUG );
-	$resql = $db->query ( $sql );
+	$resql = $db->query($sql);
 	if ($resql) {
-		$num = $db->num_rows ( $resql );
+		$num = $db->num_rows($resql);
 		$i = 0;
 
 
@@ -191,27 +191,27 @@ 
 		print "<table class=\"noborder\" width=\"100%\">";
 		print '<tr class="liste_titre">';
 			print '<td></td>';
-		print_liste_field_titre("Doctype", "liste.php", "bk.doc_type" );
-		print_liste_field_titre("Docdate", "liste.php", "bk.doc_date" );
-		print_liste_field_titre("Docref", "liste.php", "bk.doc_ref" );
+		print_liste_field_titre("Doctype", "liste.php", "bk.doc_type");
+		print_liste_field_titre("Docdate", "liste.php", "bk.doc_date");
+		print_liste_field_titre("Docref", "liste.php", "bk.doc_ref");
 // 		print_liste_field_titre("Numerocompte", "liste.php", "bk.numero_compte" );
 // 		print_liste_field_titre("Code_tiers", "liste.php", "bk.code_tiers" );
-		print_liste_field_titre("LabelAccount", "liste.php", "bk_label_compte" );
-		print_liste_field_titre("Debit", "liste.php", "bk.debit" );
-		print_liste_field_titre("Credit", "liste.php", "bk.credit" );
+		print_liste_field_titre("LabelAccount", "liste.php", "bk_label_compte");
+		print_liste_field_titre("Debit", "liste.php", "bk.debit");
+		print_liste_field_titre("Credit", "liste.php", "bk.credit");
 //		print_liste_field_titre("Amount", "liste.php", "bk.montant" );
 //		print_liste_field_titre("Sens", "liste.php", "bk.sens" );
-		print_liste_field_titre("Codejournal", "liste.php", "bk.code_journal" );
+		print_liste_field_titre("Codejournal", "liste.php", "bk.code_journal");
 		print '<td></td>';
 		print '<td></td>';
 		print "</tr>\n";
 
 		print '<tr class="liste_titre">';
 		print '<form action="" method="GET">';
-		print '<input type="hidden" name="socid" value="' . $_GET ["socid"] . '">';
-		print '<td><input type="text" name="search_doc_type" value="' . $_GET ["search_doc_type"] . '"></td>';
-		print '<td><input type="text" name="search_year" value="' . $_GET ["search_year"] . '"></td>';
-		print '<td><input type="text" name="search_doc_refe" value="' . $_GET ["search_doc_ref"] . '"></td>';
+		print '<input type="hidden" name="socid" value="'.$_GET ["socid"].'">';
+		print '<td><input type="text" name="search_doc_type" value="'.$_GET ["search_doc_type"].'"></td>';
+		print '<td><input type="text" name="search_year" value="'.$_GET ["search_year"].'"></td>';
+		print '<td><input type="text" name="search_doc_refe" value="'.$_GET ["search_doc_ref"].'"></td>';
 // 		print '<td><input type="text" name="search_compte" value="' . $_GET ["search_compte"] . '"></td>';
 // 		print '<td><input type="text" name="search_tiers" value="' . $_GET ["search_tiers"] . '"></td>';
 		print '<td>&nbsp;</td>';
@@ -220,7 +220,7 @@ 
 //		print '<td>&nbsp;</td>';
 //		print '<td>&nbsp;</td>';
 		print '<td align="right">';
-		print '<input type="image" class="liste_titre" name="button_search" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" value="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '" title="' . dol_escape_htmltag ( $langs->trans ( "Search" ) ) . '">';
+		print '<input type="image" class="liste_titre" name="button_search" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 		print '</td>';
 		print '<td>&nbsp;</td>';
 		print '<td>&nbsp;</td>';
@@ -234,54 +234,54 @@ 
 		$credit = 0;
 		$solde = 0;
 		$tmp = '';
-		while ( $i < $num ) {
-			$obj = $db->fetch_object ( $resql );
+		while ($i < $num) {
+			$obj = $db->fetch_object($resql);
 
-			if($tmp !=$obj->lettering_code || empty($tmp) )
-				$tmp =$obj->lettering_code;
+			if ($tmp != $obj->lettering_code || empty($tmp))
+				$tmp = $obj->lettering_code;
 
-			if($tmp !=$obj->lettering_code || empty($obj->lettering_code))
-				$var = ! $var;
+			if ($tmp != $obj->lettering_code || empty($obj->lettering_code))
+				$var = !$var;
 
 
-			$debit+= $obj->debit;
-			$credit+= $obj->credit;
+			$debit += $obj->debit;
+			$credit += $obj->credit;
 
-			$solde+=($obj->credit-$obj->debit);
+			$solde += ($obj->credit - $obj->debit);
 			print "<tr $bc[$var]>";
 
-			print '<td>' . $obj->rowid . '</td>';
-			if(empty($obj->lettering_code)){
-				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num=' . $obj->piece_num . '">';
-				print img_edit ();
-				print '</a>&nbsp;' . $obj->doc_type . '</td>' . "\n";
+			print '<td>'.$obj->rowid.'</td>';
+			if (empty($obj->lettering_code)) {
+				print '<td><a href="'.dol_buildpath('/accountancy/bookkeeping/card.php', 1).'?piece_num='.$obj->piece_num.'">';
+				print img_edit();
+				print '</a>&nbsp;'.$obj->doc_type.'</td>'."\n";
 			}
 			else
-				print '<td>'.$obj->doc_type . '</td>' . "\n";
+				print '<td>'.$obj->doc_type.'</td>'."\n";
 
 
 
-			print '<td>' . dol_print_date ( $db->jdate ( $obj->doc_date ), 'day' ) . '</td>';
-			print '<td>' . $obj->doc_ref . '</td>';
+			print '<td>'.dol_print_date($db->jdate($obj->doc_date), 'day').'</td>';
+			print '<td>'.$obj->doc_ref.'</td>';
 // 			print '<td>' . $obj->numero_compte . '</td>';
 // 			print '<td>' . $obj->code_tiers . '</td>';
-			print '<td>' . $obj->label_compte . '</td>';
-			print '<td>' . $obj->debit . '</td>';
-			print '<td>' . $obj->credit . '</td>';
+			print '<td>'.$obj->label_compte.'</td>';
+			print '<td>'.$obj->debit.'</td>';
+			print '<td>'.$obj->credit.'</td>';
 //			print '<td>' . $obj->montant . '</td>';
 //			print '<td>' . $obj->sens . '</td>';
-			print '<td>' . $obj->code_journal . '</td>';
-			print '<td>' . round($solde, 2) . '</td>';
+			print '<td>'.$obj->code_journal.'</td>';
+			print '<td>'.round($solde, 2).'</td>';
 
-			if(empty($obj->lettering_code)){
-				print '<td><input type="checkbox" name="ids[]" value="' . $obj->rowid . '" /></td>';
+			if (empty($obj->lettering_code)) {
+				print '<td><input type="checkbox" name="ids[]" value="'.$obj->rowid.'" /></td>';
 			}
 			else
-				print '<td>' . $obj->lettering_code . '</td>';
+				print '<td>'.$obj->lettering_code.'</td>';
 
 			print "</tr>\n";
 
-			$i ++;
+			$i++;
 
 
 
@@ -290,12 +290,12 @@ 
 
 			print '<tr class="oddeven">';
 
-			print '<td colspan="4">Mouvement totaux</td>' . "\n";
+			print '<td colspan="4">Mouvement totaux</td>'."\n";
 			print '<td></td>';
 	//		print '<td></td>';
 	//		print '<td></td>';
-			print '<td><strong>' . $debit . '</strong></td>';
-			print '<td><strong>' . $credit . '</strong></td>';
+			print '<td><strong>'.$debit.'</strong></td>';
+			print '<td><strong>'.$credit.'</strong></td>';
 			print '<td></td>';
 			print '<td></td>';
 			print '<td></td>';
@@ -303,11 +303,11 @@ 
 			print "</tr>\n";
 
 			print "<tr $bc[$var]>";
-			print '<td colspan="5">Solde Comptable</td>' . "\n";
+			print '<td colspan="5">Solde Comptable</td>'."\n";
 	//		print '<td></td>';
 	//		print '<td></td>';
 			print '<td></td>';
-			print '<td><strong>' . ($credit-$debit) . '</strong></td>';
+			print '<td><strong>'.($credit - $debit).'</strong></td>';
 			print '<td></td>';
 			print '<td></td>';
 			print '<td></td>';

htdocs/accountancy/bookkeeping/list.php

Spacing +101 added lines, -101 removed lines

@@ -24,12 +24,12 @@ 
  * \brief 		List operation of book keeping
  */
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancyexport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 
 // Langs
 $langs->load("accountancy");
@@ -78,10 +78,10 @@ 
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION)?$conf->liste_limit:$conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'alpha');
 $sortorder = GETPOST('sortorder', 'alpha');
-$page = GETPOST('page','int');
+$page = GETPOST('page', 'int');
 if ($page < 0) { $page = 0; }
 $offset = $limit * $page;
 $pageprev = $page - 1;
@@ -97,7 +97,7 @@ 
 $form = new Form($db);
 
 
-if ($action != 'export_file' && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page)) {
+if ($action != 'export_file' && !isset($_POST['begin']) && !isset($_GET['begin']) && !isset($_POST['formfilteraction']) && empty($page)) {
 	$search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y'));
 	$search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y'));
 }
@@ -108,10 +108,10 @@ 
  * Action
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
 	$search_mvt_num = '';
 	$search_doc_type = '';
@@ -132,76 +132,76 @@ 
 
 // Must be after the remove filter action, before the export.
 $param = '';
-$filter = array ();
-if (! empty($search_date_start)) {
+$filter = array();
+if (!empty($search_date_start)) {
 	$filter['t.doc_date>='] = $search_date_start;
-	$tmp=dol_getdate($search_date_start);
-	$param .= '&date_startmonth=' . $tmp['mon'] . '&date_startday=' . $tmp['mday'] . '&date_startyear=' . $tmp['year'];
+	$tmp = dol_getdate($search_date_start);
+	$param .= '&date_startmonth='.$tmp['mon'].'&date_startday='.$tmp['mday'].'&date_startyear='.$tmp['year'];
 }
-if (! empty($search_date_end)) {
+if (!empty($search_date_end)) {
 	$filter['t.doc_date<='] = $search_date_end;
-	$tmp=dol_getdate($search_date_end);
-	$param .= '&date_endmonth=' . $tmp['mon'] . '&date_endday=' . $tmp['mday'] . '&date_endyear=' . $tmp['year'];
+	$tmp = dol_getdate($search_date_end);
+	$param .= '&date_endmonth='.$tmp['mon'].'&date_endday='.$tmp['mday'].'&date_endyear='.$tmp['year'];
 }
-if (! empty($search_doc_date)) {
+if (!empty($search_doc_date)) {
 	$filter['t.doc_date'] = $search_doc_date;
-	$tmp=dol_getdate($search_doc_date);
-	$param .= '&doc_datemonth=' . $tmp['mon'] . '&doc_dateday=' . $tmp['mday'] . '&doc_dateyear=' . $tmp['year'];
+	$tmp = dol_getdate($search_doc_date);
+	$param .= '&doc_datemonth='.$tmp['mon'].'&doc_dateday='.$tmp['mday'].'&doc_dateyear='.$tmp['year'];
 }
-if (! empty($search_doc_type)) {
+if (!empty($search_doc_type)) {
 	$filter['t.doc_type'] = $search_doc_type;
-	$param .= '&search_doc_type=' . $search_doc_type;
+	$param .= '&search_doc_type='.$search_doc_type;
 }
-if (! empty($search_doc_ref)) {
+if (!empty($search_doc_ref)) {
 	$filter['t.doc_ref'] = $search_doc_ref;
-	$param .= '&search_doc_ref=' . $search_doc_ref;
+	$param .= '&search_doc_ref='.$search_doc_ref;
 }
-if (! empty($search_accountancy_code)) {
+if (!empty($search_accountancy_code)) {
 	$filter['t.numero_compte'] = $search_accountancy_code;
-	$param .= '&search_accountancy_code=' . $search_accountancy_code;
+	$param .= '&search_accountancy_code='.$search_accountancy_code;
 }
-if (! empty($search_accountancy_code_start)) {
+if (!empty($search_accountancy_code_start)) {
 	$filter['t.numero_compte>='] = $search_accountancy_code_start;
-	$param .= '&search_accountancy_code_start=' . $search_accountancy_code_start;
+	$param .= '&search_accountancy_code_start='.$search_accountancy_code_start;
 }
-if (! empty($search_accountancy_code_end)) {
+if (!empty($search_accountancy_code_end)) {
 	$filter['t.numero_compte<='] = $search_accountancy_code_end;
-	$param .= '&search_accountancy_code_end=' . $search_accountancy_code_end;
+	$param .= '&search_accountancy_code_end='.$search_accountancy_code_end;
 }
-if (! empty($search_accountancy_aux_code)) {
+if (!empty($search_accountancy_aux_code)) {
 	$filter['t.subledger_account'] = $search_accountancy_aux_code;
-	$param .= '&search_accountancy_aux_code=' . $search_accountancy_aux_code;
+	$param .= '&search_accountancy_aux_code='.$search_accountancy_aux_code;
 }
-if (! empty($search_accountancy_aux_code_start)) {
+if (!empty($search_accountancy_aux_code_start)) {
 	$filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
-	$param .= '&search_accountancy_aux_code_start=' . $search_accountancy_aux_code_start;
+	$param .= '&search_accountancy_aux_code_start='.$search_accountancy_aux_code_start;
 }
-if (! empty($search_accountancy_aux_code_end)) {
+if (!empty($search_accountancy_aux_code_end)) {
 	$filter['t.subledger_account<='] = $search_accountancy_aux_code_end;
-	$param .= '&search_accountancy_aux_code_end=' . $search_accountancy_aux_code_end;
+	$param .= '&search_accountancy_aux_code_end='.$search_accountancy_aux_code_end;
 }
-if (! empty($search_mvt_label)) {
+if (!empty($search_mvt_label)) {
 	$filter['t.label_operation'] = $search_mvt_label;
-	$param .= '&search_mvt_label=' . $search_mvt_label;
+	$param .= '&search_mvt_label='.$search_mvt_label;
 }
-if (! empty($search_direction)) {
+if (!empty($search_direction)) {
 	$filter['t.sens'] = $search_direction;
-	$param .= '&search_direction=' . $search_direction;
+	$param .= '&search_direction='.$search_direction;
 }
-if (! empty($search_ledger_code)) {
+if (!empty($search_ledger_code)) {
 	$filter['t.code_journal'] = $search_ledger_code;
-	$param .= '&search_ledger_code=' . $search_ledger_code;
+	$param .= '&search_ledger_code='.$search_ledger_code;
 }
-if (! empty($search_mvt_num)) {
+if (!empty($search_mvt_num)) {
 	$filter['t.piece_num'] = $search_mvt_num;
-	$param .= '&search_mvt_num=' . $search_mvt_num;
+	$param .= '&search_mvt_num='.$search_mvt_num;
 }
 
 if ($action == 'delbookkeeping') {
 
 	$import_key = GETPOST('importkey', 'alpha');
 
-	if (! empty($import_key)) {
+	if (!empty($import_key)) {
 		$result = $object->deleteByImportkey($import_key);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -213,17 +213,17 @@ 
 if ($action == 'delbookkeepingyearconfirm') {
 
 	$delyear = GETPOST('delyear', 'int');
-	if ($delyear==-1) {
-		$delyear=0;
+	if ($delyear == -1) {
+		$delyear = 0;
 	}
-	$deljournal = GETPOST('deljournal','alpha');
-	if ($deljournal==-1) {
-		$deljournal=0;
+	$deljournal = GETPOST('deljournal', 'alpha');
+	if ($deljournal == -1) {
+		$deljournal = 0;
 	}
 
-	if (! empty($delyear) || ! empty($deljournal))
+	if (!empty($delyear) || !empty($deljournal))
 	{
-		$result = $object->deleteByYearAndJournal($delyear,$deljournal);
+		$result = $object->deleteByYearAndJournal($delyear, $deljournal);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -245,7 +245,7 @@ 
 
 	$mvt_num = GETPOST('mvt_num', 'int');
 
-	if (! empty($mvt_num)) {
+	if (!empty($mvt_num)) {
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -303,15 +303,15 @@ 
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
-$num=count($object->lines);
+$num = count($object->lines);
 
 if ($action == 'delmouv') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
 	print $formconfirm;
 }
 if ($action == 'delbookkeepingyear') {
 
-	$form_question = array ();
+	$form_question = array();
 	$delyear = GETPOST('delyear');
 	$deljournal = GETPOST('deljournal');
 
@@ -321,16 +321,16 @@ 
 	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
 	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
 
-	$form_question['delyear'] = array (
+	$form_question['delyear'] = array(
 			'name' => 'delyear',
 			'type' => 'select',
 			'label' => $langs->trans('DelYear'),
 			'values' => $year_array,
 			'default' => $delyear
 	);
-	$form_question['deljournal'] = array (
+	$form_question['deljournal'] = array(
 			'name' => 'deljournal',
-			'type' => 'other',	   // We don't use select here, the journal_array is already a select html component
+			'type' => 'other', // We don't use select here, the journal_array is already a select html component
 			'label' => $langs->trans('DelJournal'),
 			'value' => $journal_array,
 			'default' => $deljournal
@@ -341,10 +341,10 @@ 
 }
 
 //$param='';	param started before
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="action" value="list">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -353,20 +353,20 @@ 
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 
-$listofformat=AccountancyExport::getType();
-$button = '<a class="butAction" name="button_export_file" href="'.$_SERVER["PHP_SELF"].'?action=export_file'.($param?'&'.$param:'').'">';
-if (count($filter)) $button.= $langs->trans("ExportFilteredList");
-else $button.= $langs->trans("ExportList");
-$button.=' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')';
-$button.= '</a>';
+$listofformat = AccountancyExport::getType();
+$button = '<a class="butAction" name="button_export_file" href="'.$_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : '').'">';
+if (count($filter)) $button .= $langs->trans("ExportFilteredList");
+else $button .= $langs->trans("ExportList");
+$button .= ' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')';
+$button .= '</a>';
 
-$groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php"">' . $langs->trans("GroupByAccountAccounting") . '</a>';
+$groupby = ' <a class="nohover" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php"">'.$langs->trans("GroupByAccountAccounting").'</a>';
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $button, $result, $nbtotalofrecords, 'title_accountancy', 0, $groupby, '', $limit);
 
-print '<div class="tabsAction tabsActionNoBottom">' . "\n";
-print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">' . $langs->trans("NewAccountingMvt") . '</a></div>';
-print '<div class="inline-block divButAction"><a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param?'&'.$param:'').'">' . $langs->trans("DelBookKeeping") . '</a></div>';
+print '<div class="tabsAction tabsActionNoBottom">'."\n";
+print '<div class="inline-block divButAction"><a class="butAction" href="./card.php?action=create">'.$langs->trans("NewAccountingMvt").'</a></div>';
+print '<div class="inline-block divButAction"><a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear'.($param ? '&'.$param : '').'">'.$langs->trans("DelBookKeeping").'</a></div>';
 
 print '</div>';
 
@@ -374,26 +374,26 @@ 
 print '<table class="noborder" width="100%">';
 
 print '<tr class="liste_titre_filter">';
-print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="' . dol_escape_htmltag($search_mvt_num) . '"></td>';
+print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
 print '<td class="liste_titre center">';
 print '<div class="nowrap">';
-print $langs->trans('From') . ' ';
+print $langs->trans('From').' ';
 print $form->select_date($search_date_start, 'date_start', 0, 0, 1);
 print '</div>';
 print '<div class="nowrap">';
-print $langs->trans('to') . ' ';
+print $langs->trans('to').' ';
 print $form->select_date($search_date_end, 'date_end', 0, 0, 1);
 print '</div>';
 print '</td>';
-print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="' . dol_escape_htmltag($search_doc_ref) . '"></td>';
+print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
 print '<td class="liste_titre">';
 print '<div class="nowrap">';
 print $langs->trans('From').' ';
-print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array (), 1, 1, 'maxwidth200');
+print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
 print '</div>';
 print '<div class="nowrap">';
 print $langs->trans('to').' ';
-print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array (), 1, 1, 'maxwidth200');
+print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
 print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
@@ -401,7 +401,7 @@ 
 print $langs->trans('From').' ';
 // TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 // use setup of keypress to select thirdparty and this hang browser on large database.
-if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 {
 	print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 }
@@ -414,7 +414,7 @@ 
 print $langs->trans('to').' ';
 // TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 // use setup of keypress to select thirdparty and this hang browser on large database.
-if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
+if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 {
 	print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 }
@@ -425,13 +425,13 @@ 
 print '</div>';
 print '</td>';
 print '<td class="liste_titre">';
-print '<input type="text" size="7" class="flat" name="search_mvt_label" value="' . $search_mvt_label . '"/>';
+print '<input type="text" size="7" class="flat" name="search_mvt_label" value="'.$search_mvt_label.'"/>';
 print '</td>';
 print '<td class="liste_titre center">&nbsp;</td>';
 print '<td class="liste_titre center">&nbsp;</td>';
-print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="' . $search_ledger_code . '"></td>';
+print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.$search_ledger_code.'"></td>';
 print '<td class="liste_titre center">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print '</tr>';
@@ -446,8 +446,8 @@ 
 print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
-$checkpicto='';
-if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+$checkpicto = '';
+if ($massactionbutton) $checkpicto = $form->showCheckAddButtons('checkforselect', 1);
 print_liste_field_titre($checkpicto, $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 print "</tr>\n";
 
@@ -455,7 +455,7 @@ 
 $total_debit = 0;
 $total_credit = 0;
 
-$i=0;
+$i = 0;
 while ($i < min($num, $limit))
 {
 	$line = $object->lines[$i];
@@ -465,23 +465,23 @@ 
 
 	print '<tr class="oddeven">';
 
-	print '<td><a href="./card.php?piece_num=' . $line->piece_num . '">' . $line->piece_num . '</a></td>';
-	print '<td align="center">' . dol_print_date($line->doc_date, 'day') . '</td>';
-	print '<td class="nowrap">' . $line->doc_ref . '</td>';
-	print '<td>' . length_accountg($line->numero_compte) . '</td>';
-	print '<td>' . length_accounta($line->subledger_account) . '</td>';
-	print '<td>' . $line->label_operation . '</td>';
-	print '<td align="right">' . ($line->debit ? price($line->debit) : ''). '</td>';
-	print '<td align="right">' . ($line->credit ? price($line->credit) : '') . '</td>';
+	print '<td><a href="./card.php?piece_num='.$line->piece_num.'">'.$line->piece_num.'</a></td>';
+	print '<td align="center">'.dol_print_date($line->doc_date, 'day').'</td>';
+	print '<td class="nowrap">'.$line->doc_ref.'</td>';
+	print '<td>'.length_accountg($line->numero_compte).'</td>';
+	print '<td>'.length_accounta($line->subledger_account).'</td>';
+	print '<td>'.$line->label_operation.'</td>';
+	print '<td align="right">'.($line->debit ? price($line->debit) : '').'</td>';
+	print '<td align="right">'.($line->credit ? price($line->credit) : '').'</td>';
 
 	$accountingjournal = new AccountingJournal($db);
-	$result = $accountingjournal->fetch('',$line->code_journal);
-	$journaltoshow = (($result > 0)?$accountingjournal->getNomUrl(0,0,0,'',0) : $line->code_journal);
-	print '<td align="center">' . $journaltoshow . '</td>';
+	$result = $accountingjournal->fetch('', $line->code_journal);
+	$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
+	print '<td align="center">'.$journaltoshow.'</td>';
 
 	print '<td align="center">';
-	print '<a href="./card.php?piece_num=' . $line->piece_num . '">' . img_edit() . '</a>&nbsp;';
-	print '<a href="' . $_SERVER['PHP_SELF'] . '?action=delmouv&mvt_num=' . $line->piece_num . $param . '&page=' . $page . '">' . img_delete() . '</a>';
+	print '<a href="./card.php?piece_num='.$line->piece_num.'">'.img_edit().'</a>&nbsp;';
+	print '<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.'">'.img_delete().'</a>';
 	print '</td>';
 	print "</tr>\n";
 

Braces +37 added lines, -23 removed lines

@@ -86,8 +86,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.rowid";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.rowid";
+}
 
 
 $object = new BookKeeping($db);
@@ -111,9 +115,11 @@ 
 if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
 if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
 
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) {
+	// All tests are required to be compatible with all browsers
 {
 	$search_mvt_num = '';
+}
 	$search_doc_type = '';
 	$search_doc_ref = '';
 	$search_doc_date = '';
@@ -226,15 +232,13 @@ 
 		$result = $object->deleteByYearAndJournal($delyear,$deljournal);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
+		} else
 		{
 			setEventMessages("RecordDeleted", null, 'mesgs');
 		}
 		Header("Location: list.php");
 		exit;
-	}
-	else
+	} else
 	{
 		setEventMessages("NoRecordDeleted", null, 'warnings');
 		Header("Location: list.php");
@@ -249,8 +253,7 @@ 
 		$result = $object->deleteMvtNum($mvt_num);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		}
@@ -267,8 +270,7 @@ 
 	if ($result < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-	else
+	} else
 	{
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines);
@@ -341,12 +343,18 @@ 
 }
 
 //$param='';	param started before
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param.='&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param.='&limit='.$limit;
+}
 
 print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -355,8 +363,11 @@ 
 
 $listofformat=AccountancyExport::getType();
 $button = '<a class="butAction" name="button_export_file" href="'.$_SERVER["PHP_SELF"].'?action=export_file'.($param?'&'.$param:'').'">';
-if (count($filter)) $button.= $langs->trans("ExportFilteredList");
-else $button.= $langs->trans("ExportList");
+if (count($filter)) {
+	$button.= $langs->trans("ExportFilteredList");
+} else {
+	$button.= $langs->trans("ExportList");
+}
 $button.=' ('.$listofformat[$conf->global->ACCOUNTING_EXPORT_MODELCSV].')';
 $button.= '</a>';
 
@@ -404,8 +415,7 @@ 
 if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 {
 	print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
-}
-else
+} else
 {
 	print '<input type="text" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
 }
@@ -417,8 +427,7 @@ 
 if (! empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 {
 	print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
-}
-else
+} else
 {
 	print '<input type="text" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
 }
@@ -447,7 +456,9 @@ 
 print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("Codejournal", $_SERVER['PHP_SELF'], "t.code_journal", "", $param, 'align="center"', $sortfield, $sortorder);
 $checkpicto='';
-if ($massactionbutton) $checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+if ($massactionbutton) {
+	$checkpicto=$form->showCheckAddButtons('checkforselect', 1);
+}
 print_liste_field_titre($checkpicto, $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 print "</tr>\n";
 
@@ -489,8 +500,11 @@ 
 }
 
 print '<tr class="liste_total">';
-if ($num < $limit) print '<td align="left" colspan="7">'.$langs->trans("Total").'</td>';
-else print '<td align="left" colspan="7">'.$langs->trans("Totalforthispage").'</td>';
+if ($num < $limit) {
+	print '<td align="left" colspan="7">'.$langs->trans("Total").'</td>';
+} else {
+	print '<td align="left" colspan="7">'.$langs->trans("Totalforthispage").'</td>';
+}
 print '</td>';
 print '<td  align="right">';
 print price($total_debit);