alxarafe / alixar

dolibarr/htdocs/core/lib/tax.lib.php

Indentation +549 added lines, -549 removed lines

@@ -41,10 +41,10 @@ 
     $h = 0;
     $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans('Card');
+    $head[$h][2] = 'card';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -52,16 +52,16 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'tax');
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->tax->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
     $head[$h][1] = $langs->trans("Info");
@@ -95,39 +95,39 @@ 
     // If we use date_start and date_end, we must not use $y, $m, $q
     if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
     {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+        dol_print_error('', 'Bad value of input parameter for tax_by_rate');
     }
 
     $list=array();
     if ($direction == 'sell')
     {
-    	$invoicetable='facture';
-    	$invoicedettable='facturedet';
-    	$fk_facture='fk_facture';
-    	$fk_facture2='fk_facture';
-    	$fk_payment='fk_paiement';
-    	$total_tva='total_tva';
-    	$paymenttable='paiement';
-    	$paymentfacturetable='paiement_facture';
-    	$invoicefieldref='ref';
+        $invoicetable='facture';
+        $invoicedettable='facturedet';
+        $fk_facture='fk_facture';
+        $fk_facture2='fk_facture';
+        $fk_payment='fk_paiement';
+        $total_tva='total_tva';
+        $paymenttable='paiement';
+        $paymentfacturetable='paiement_facture';
+        $invoicefieldref='ref';
     }
     if ($direction == 'buy')
     {
-    	$invoicetable='facture_fourn';
-    	$invoicedettable='facture_fourn_det';
-    	$fk_facture='fk_facture_fourn';
-    	$fk_facture2='fk_facturefourn';
-    	$fk_payment='fk_paiementfourn';
-    	$total_tva='tva';
-    	$paymenttable='paiementfourn';
-    	$paymentfacturetable='paiementfourn_facturefourn';
-    	$invoicefieldref='ref';
+        $invoicetable='facture_fourn';
+        $invoicedettable='facture_fourn_det';
+        $fk_facture='fk_facture_fourn';
+        $fk_facture2='fk_facturefourn';
+        $fk_payment='fk_paiementfourn';
+        $total_tva='tva';
+        $paymenttable='paiementfourn';
+        $paymentfacturetable='paiementfourn_facturefourn';
+        $invoicefieldref='ref';
     }
 
     if ( strpos( $type, 'localtax' ) === 0 ) {
-    	$f_rate = $type . '_tx';
+        $f_rate = $type . '_tx';
     } else {
-    	$f_rate = 'tva_tx';
+        $f_rate = 'tva_tx';
     }
 
     $total_localtax1='total_localtax1';
@@ -139,146 +139,146 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
     {
-    	// Count on delivery date (use invoice date as delivery is unknown)
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " 0 as payment_id, 0 as payment_amount";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	if ($y && $m)
-    	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	else if ($y)
-    	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
+        // Count on delivery date (use invoice date as delivery is unknown)
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " 0 as payment_id, 0 as payment_amount";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        if ($y && $m)
+        {
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        else if ($y)
+        {
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	else if ($y)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+        $sql.= " pa.datep as datep";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        $sql.= " AND pf.".$fk_facture2." = f.rowid";
+        $sql.= " AND pa.rowid = pf.".$fk_payment;
+        if ($y && $m)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        else if ($y)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql) return -1;
     if ($sql == 'TODO') return -2;
     if ($sql != 'TODO')
     {
-    	dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
-
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$oldrowid='';
-    		while($assoc = $db->fetch_array($resql))
-    		{
-    			if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
-    			if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
-
-    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    			{
-    				$oldrowid=$assoc['rowid'];
-    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
-
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][]  = $assoc['total_localtax2'];
-
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
-
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
-
-    			$company_id = $assoc['company_id'];
-    		}
-    	}
-    	else
-    	{
-    		dol_print_error($db);
-    		return -3;
-    	}
+        dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
+
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $company_id = -1;
+            $oldrowid='';
+            while($assoc = $db->fetch_array($resql))
+            {
+                if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
+                if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
+                if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
+                if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+
+                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+                {
+                    $oldrowid=$assoc['rowid'];
+                    $list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+                    $list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+                    $list[$assoc['company_id']]['localtax1']      += $assoc['total_localtax1'];
+                    $list[$assoc['company_id']]['localtax2']      += $assoc['total_localtax2'];
+                }
+                $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                $list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+                $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+                $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+                $list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+                $list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+                $list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+                $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                $list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+                $list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+                $list[$assoc['company_id']]['type'][] = $assoc['type'];
+                $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                $list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+                $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+                $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+                $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+                $list[$assoc['company_id']]['localtax2_list'][]  = $assoc['total_localtax2'];
+
+                $list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+                $list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+                $list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+
+                $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+                $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+                $company_id = $assoc['company_id'];
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+            return -3;
+        }
     }
 
 
@@ -287,149 +287,149 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
     {
-    	// Count on invoice date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " 0 as payment_id, 0 as payment_amount";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	if ($y && $m)
-    	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	else if ($y)
-    	{
-    		$sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 1";                              // Limit to services
-    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture;
+        // Count on invoice date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " 0 as payment_id, 0 as payment_amount";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d" ;
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        if ($y && $m)
+        {
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        else if ($y)
+        {
+            $sql.= " AND f.datef >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND f.datef <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(f.datef,'%m') > ".(($q-1)*3)." AND date_format(f.datef,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 1";                              // Limit to services
+        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture;
     }
     else
     {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	else if ($y)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 1";                              		// Limit to services
-    	$sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+        $sql.= " pa.datep as datep";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        $sql.= " AND pf.".$fk_facture2." = f.rowid";
+        $sql.= " AND pa.rowid = pf.".$fk_payment;
+        if ($y && $m)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        else if ($y)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 1";                              		// Limit to services
+        $sql.= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql)
     {
-    	dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-    	return -1;  // -1 = Not accountancy module enabled
+        dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+        return -1;  // -1 = Not accountancy module enabled
     }
     if ($sql == 'TODO') return -2; // -2 = Feature not yet available
     if ($sql != 'TODO')
     {
-    	dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    	$resql = $db->query($sql);
-    	if ($resql)
-    	{
-    		$company_id = -1;
-    		$oldrowid='';
-    		while($assoc = $db->fetch_array($resql))
-    		{
-    			if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
-    			if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
-    			if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
-
-    			if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    			{
-    				$oldrowid=$assoc['rowid'];
-    				$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    			}
-    			$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    			$list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
-    			$list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
-    			$list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
-    			$list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
-    			$list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
-    			$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    			$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    			$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-    			$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    			$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    			$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    			$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    			$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
-
-    			$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    			$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    			$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    			$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-    			$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    			$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    			$list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
-
-    			$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    			$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
-
-    			$company_id = $assoc['company_id'];
-    		}
-    	}
-    	else
-    	{
-    		dol_print_error($db);
-    		return -3;
-    	}
+        dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+        $resql = $db->query($sql);
+        if ($resql)
+        {
+            $company_id = -1;
+            $oldrowid='';
+            while($assoc = $db->fetch_array($resql))
+            {
+                if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
+                if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
+                if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
+                if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+
+                if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+                {
+                    $oldrowid=$assoc['rowid'];
+                    $list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+                    $list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
+                    $list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+                    $list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+                }
+                $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                $list[$assoc['company_id']]['dtype'][] = $assoc['dtype'];
+                $list[$assoc['company_id']]['datef'][] = $db->jdate($assoc['datef']);
+                $list[$assoc['company_id']]['datep'][] = $db->jdate($assoc['datep']);
+                $list[$assoc['company_id']]['company_name'][] = $assoc['company_name'];
+                $list[$assoc['company_id']]['company_id'][] = $assoc['company_id'];
+                $list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+                $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                $list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+                $list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+                $list[$assoc['company_id']]['type'][] = $assoc['type'];
+                $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                $list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+                $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+                $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+                $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+                $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+                $list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+                $list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+                $list[$assoc['company_id']]['ptype'][] = $assoc['ptype'];
+
+                $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+                $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+                $company_id = $assoc['company_id'];
+            }
+        }
+        else
+        {
+            dol_print_error($db);
+            return -3;
+        }
     }
 
 
@@ -437,104 +437,104 @@ 
 
     if ($direction == 'buy')		// buy only for expense reports
     {
-    	// Define sql request
-    	$sql='';
-
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
-    	$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-    	$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-    	$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-    	$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-    	$sql.= " WHERE e.entity = " . $conf->entity;
-    	$sql.= " AND e.fk_statut in (6)";
-    	if ($y && $m)
-    	{
-    		$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	else if ($y)
-    	{
-    		$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = -1";
-    	$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-    	$sql.= " ORDER BY e.rowid";
-
-    	if (! $sql)
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-    		return -1;  // -1 = Not accountancy module enabled
-    	}
-    	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-    	if ($sql != 'TODO')
-    	{
-    		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-    		$resql = $db->query($sql);
-    		if ($resql)
-    		{
-    			$company_id = -1;
-    			$oldrowid='';
-    			while($assoc = $db->fetch_array($resql))
-    			{
-    				if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
-    				if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
-    				if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
-    				if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
-
-    				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-    				{
-    					$oldrowid=$assoc['rowid'];
-    					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
-    					$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
-    					$list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
-    					$list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
-    				}
-
-    				$list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
-    				$list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
-    				$list[$assoc['company_id']]['datef'][] = $assoc['datef'];
-    				$list[$assoc['company_id']]['company_name'][] = '';
-    				$list[$assoc['company_id']]['company_id'][] = '';
-    				$list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
-    				$list[$assoc['company_id']]['drate'][] = $assoc['rate'];
-    				$list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-    				$list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-    				$list[$assoc['company_id']]['facid'][] = $assoc['facid'];
-    				$list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
-    				$list[$assoc['company_id']]['type'][] = $assoc['type'];
-    				$list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-    				$list[$assoc['company_id']]['descr'][] = $assoc['descr'];
-
-    				$list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
-    				$list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
-    				$list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
-    				$list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-    				$list[$assoc['company_id']]['pid'][] = $assoc['pid'];
-    				$list[$assoc['company_id']]['pref'][] = $assoc['pref'];
-    				$list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
-
-    				$list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
-    				$list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
-
-    				$company_id = $assoc['company_id'];
-    			}
-    		}
-    		else
-    		{
-    			dol_print_error($db);
-    			return -3;
-    		}
-    	}
+        // Define sql request
+        $sql='';
+
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
+        $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+        $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+        $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+        $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+        $sql.= " WHERE e.entity = " . $conf->entity;
+        $sql.= " AND e.fk_statut in (6)";
+        if ($y && $m)
+        {
+            $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        else if ($y)
+        {
+            $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = -1";
+        $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+        $sql.= " ORDER BY e.rowid";
+
+        if (! $sql)
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+            return -1;  // -1 = Not accountancy module enabled
+        }
+        if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+        if ($sql != 'TODO')
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $company_id = -1;
+                $oldrowid='';
+                while($assoc = $db->fetch_array($resql))
+                {
+                    if (! isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht']=0;
+                    if (! isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat']=0;
+                    if (! isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1']=0;
+                    if (! isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2']=0;
+
+                    if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+                    {
+                        $oldrowid=$assoc['rowid'];
+                        $list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
+                        $list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
+                        $list[$assoc['company_id']]['localtax1']	 += $assoc['total_localtax1'];
+                        $list[$assoc['company_id']]['localtax2']	 += $assoc['total_localtax2'];
+                    }
+
+                    $list[$assoc['company_id']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                    $list[$assoc['company_id']]['dtype'][] = 'ExpenseReportPayment';
+                    $list[$assoc['company_id']]['datef'][] = $assoc['datef'];
+                    $list[$assoc['company_id']]['company_name'][] = '';
+                    $list[$assoc['company_id']]['company_id'][] = '';
+                    $list[$assoc['company_id']]['user_id'][] = $assoc['fk_user_author'];
+                    $list[$assoc['company_id']]['drate'][] = $assoc['rate'];
+                    $list[$assoc['company_id']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                    $list[$assoc['company_id']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                    $list[$assoc['company_id']]['facid'][] = $assoc['facid'];
+                    $list[$assoc['company_id']]['facnum'][] = $assoc['facnum'];
+                    $list[$assoc['company_id']]['type'][] = $assoc['type'];
+                    $list[$assoc['company_id']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                    $list[$assoc['company_id']]['descr'][] = $assoc['descr'];
+
+                    $list[$assoc['company_id']]['totalht_list'][] = $assoc['total_ht'];
+                    $list[$assoc['company_id']]['vat_list'][] = $assoc['total_vat'];
+                    $list[$assoc['company_id']]['localtax1_list'][] = $assoc['total_localtax1'];
+                    $list[$assoc['company_id']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+                    $list[$assoc['company_id']]['pid'][] = $assoc['pid'];
+                    $list[$assoc['company_id']]['pref'][] = $assoc['pref'];
+                    $list[$assoc['company_id']]['ptype'][] = 'ExpenseReportPayment';
+
+                    $list[$assoc['company_id']]['payment_id'][] = $assoc['payment_id'];
+                    $list[$assoc['company_id']]['payment_amount'][] = $assoc['payment_amount'];
+
+                    $company_id = $assoc['company_id'];
+                }
+            }
+            else
+            {
+                dol_print_error($db);
+                return -3;
+            }
+        }
     }
 
     return $list;
@@ -563,7 +563,7 @@ 
     // If we use date_start and date_end, we must not use $y, $m, $q
     if (($date_start || $date_end) && (! empty($y) || ! empty($m) || ! empty($q)))
     {
-    	dol_print_error('', 'Bad value of input parameter for tax_by_rate');
+        dol_print_error('', 'Bad value of input parameter for tax_by_rate');
     }
 
     $list=array();
@@ -593,14 +593,14 @@ 
         $invoicefieldref='ref';
     }
 
-	if ( strpos( $type, 'localtax' ) === 0 ) {
-		$f_rate = $type . '_tx';
-	} else {
-		$f_rate = 'tva_tx';
-	}
+    if ( strpos( $type, 'localtax' ) === 0 ) {
+        $f_rate = $type . '_tx';
+    } else {
+        $f_rate = 'tva_tx';
+    }
 
-	$total_localtax1='total_localtax1';
-	$total_localtax2='total_localtax2';
+    $total_localtax1='total_localtax1';
+    $total_localtax2='total_localtax2';
 
 
     // CAS DES BIENS/PRODUITS
@@ -608,7 +608,7 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
     {
         // Count on delivery date (use invoice date as delivery is unknown)
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@@ -646,44 +646,44 @@ 
     }
     else
     {
-    	// Count on payments date
-    	$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
-    	$sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
-    	$sql.= " d.date_start as date_start, d.date_end as date_end,";
-    	$sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
-    	$sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
-    	$sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
-    	$sql.= " pa.datep as datep";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
-    	$sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
-    	$sql.= " ".MAIN_DB_PREFIX."societe as s,";
-    	$sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
-    	$sql.= " WHERE f.entity = " . $conf->entity;
-    	$sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-    	if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-    	else $sql.= " AND f.type IN (0,1,2,3,5)";
-    	$sql.= " AND f.rowid = d.".$fk_facture;
-    	$sql.= " AND s.rowid = f.fk_soc";
-    	$sql.= " AND pf.".$fk_facture2." = f.rowid";
-    	$sql.= " AND pa.rowid = pf.".$fk_payment;
-    	if ($y && $m)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-    	}
-    	else if ($y)
-    	{
-    		$sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-    		$sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-    	}
-    	if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
-    	if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
-    	$sql.= " AND (d.product_type = 0";                              // Limit to products
-    	$sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
-    	$sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
+        $sql .=" d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
+        $sql.= " d.date_start as date_start, d.date_end as date_end,";
+        $sql.= " f.".$invoicefieldref." as facnum, f.type, f.total_ttc as ftotal_ttc, f.datef, s.nom as company_name, s.rowid as company_id,";
+        $sql.= " p.rowid as pid, p.ref as pref, p.fk_product_type as ptype,";
+        $sql.= " pf.".$fk_payment." as payment_id, pf.amount as payment_amount,";
+        $sql.= " pa.datep as datep";
+        $sql.= " FROM ".MAIN_DB_PREFIX.$invoicetable." as f,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymentfacturetable." as pf,";
+        $sql.= " ".MAIN_DB_PREFIX.$paymenttable." as pa,";
+        $sql.= " ".MAIN_DB_PREFIX."societe as s,";
+        $sql.= " ".MAIN_DB_PREFIX.$invoicedettable." as d";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
+        $sql.= " WHERE f.entity = " . $conf->entity;
+        $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
+        if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
+        $sql.= " AND f.rowid = d.".$fk_facture;
+        $sql.= " AND s.rowid = f.fk_soc";
+        $sql.= " AND pf.".$fk_facture2." = f.rowid";
+        $sql.= " AND pa.rowid = pf.".$fk_payment;
+        if ($y && $m)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        else if ($y)
+        {
+            $sql.= " AND pa.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND pa.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(pa.datep,'%m') > ".(($q-1)*3)." AND date_format(pa.datep,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = 0";                              // Limit to products
+        $sql.= " AND d.date_start is null AND d.date_end IS NULL)";     // enhance detection of products
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        $sql.= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
     if (! $sql) return -1;
@@ -699,8 +699,8 @@ 
             $oldrowid='';
             while($assoc = $db->fetch_array($resql))
             {
-            	// Code to avoid warnings when array entry not defined
-            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                // Code to avoid warnings when array entry not defined
+                if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
                 if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
                 if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
                 if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
@@ -756,7 +756,7 @@ 
     // Define sql request
     $sql='';
     if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-    	|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
+        || ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
     {
         // Count on invoice date
         $sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
@@ -772,7 +772,7 @@ 
         $sql.= " WHERE f.entity = " . $conf->entity;
         $sql.= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
         if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-		else $sql.= " AND f.type IN (0,1,2,3,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
         $sql.= " AND f.rowid = d.".$fk_facture;
         $sql.= " AND s.rowid = f.fk_soc";
         if ($y && $m)
@@ -811,7 +811,7 @@ 
         $sql.= " WHERE f.entity = " . $conf->entity;
         $sql.= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
         if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql.= " AND f.type IN (0,1,2,5)";
-		else $sql.= " AND f.type IN (0,1,2,3,5)";
+        else $sql.= " AND f.type IN (0,1,2,3,5)";
         $sql.= " AND f.rowid = d.".$fk_facture;
         $sql.= " AND s.rowid = f.fk_soc";
         $sql.= " AND pf.".$fk_facture2." = f.rowid";
@@ -850,10 +850,10 @@ 
             $oldrowid='';
             while($assoc = $db->fetch_array($resql))
             {
-            	// Code to avoid warnings when array entry not defined
-            	if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                // Code to avoid warnings when array entry not defined
+                if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
                 if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
-				if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
+                if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
                 if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
 
                 if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
@@ -904,108 +904,108 @@ 
 
     // CASE OF EXPENSE REPORT
 
-	if ($direction == 'buy')		// buy only for expense reports
-	{
-		// Define sql request
-		$sql='';
-
-		// Count on payments date
-		$sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
-		$sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
-		$sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
-		$sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
-		$sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
-		$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
-		$sql.= " WHERE e.entity = " . $conf->entity;
-		$sql.= " AND e.fk_statut in (6)";
-		if ($y && $m)
-		{
-			$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
-			$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
-		}
-		else if ($y)
-		{
-			$sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
-			$sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
-		}
-		if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
-		if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-		$sql.= " AND (d.product_type = -1";
-		$sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
-		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
-		$sql.= " ORDER BY e.rowid";
-
-		if (! $sql)
-		{
-			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
-			return -1;  // -1 = Not accountancy module enabled
-		}
-		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-		if ($sql != 'TODO')
-		{
-			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
-			$resql = $db->query($sql);
-			if ($resql)
-			{
-				$rate = -1;
-				$oldrowid='';
-				while($assoc = $db->fetch_array($resql))
-				{
-					// Code to avoid warnings when array entry not defined
-					if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
-					if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
-					if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
-					if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
-
-					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-					{
-						$oldrowid=$assoc['rowid'];
-						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
+    if ($direction == 'buy')		// buy only for expense reports
+    {
+        // Define sql request
+        $sql='';
+
+        // Count on payments date
+        $sql = "SELECT d.rowid, d.product_type as dtype, e.rowid as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.total_tva as total_vat, e.note_private as descr,";
+        $sql .=" d.total_localtax1 as total_localtax1, d.total_localtax2 as total_localtax2, ";
+        $sql.= " e.date_debut as date_start, e.date_fin as date_end, e.fk_user_author,";
+        $sql.= " e.ref as facnum, e.total_ttc as ftotal_ttc, e.date_create, d.fk_c_type_fees as type,";
+        $sql.= " p.fk_bank as payment_id, p.amount as payment_amount, p.rowid as pid, e.ref as pref";
+        $sql.= " FROM ".MAIN_DB_PREFIX."expensereport as e ";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport_det as d ON d.fk_expensereport = e.rowid ";
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
+        $sql.= " WHERE e.entity = " . $conf->entity;
+        $sql.= " AND e.fk_statut in (6)";
+        if ($y && $m)
+        {
+            $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,$m,false))."'";
+            $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,$m,false))."'";
+        }
+        else if ($y)
+        {
+            $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($y,1,false))."'";
+            $sql.= " AND p.datep <= '".$db->idate(dol_get_last_day($y,12,false))."'";
+        }
+        if ($q) $sql.= " AND (date_format(p.datep,'%m') > ".(($q-1)*3)." AND date_format(p.datep,'%m') <= ".($q*3).")";
+        if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+        $sql.= " AND (d.product_type = -1";
+        $sql.= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)";       // enhance detection of service
+        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql.= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+        $sql.= " ORDER BY e.rowid";
+
+        if (! $sql)
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql,LOG_ERR);
+            return -1;  // -1 = Not accountancy module enabled
+        }
+        if ($sql == 'TODO') return -2; // -2 = Feature not yet available
+        if ($sql != 'TODO')
+        {
+            dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
+            $resql = $db->query($sql);
+            if ($resql)
+            {
+                $rate = -1;
+                $oldrowid='';
+                while($assoc = $db->fetch_array($resql))
+                {
+                    // Code to avoid warnings when array entry not defined
+                    if (! isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht']=0;
+                    if (! isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat']=0;
+                    if (! isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1']=0;
+                    if (! isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2']=0;
+
+                    if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
+                    {
+                        $oldrowid=$assoc['rowid'];
+                        $list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
                         $list[$assoc['rate']]['vat']       += $assoc['total_vat'];
-						$list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
-						$list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
-					}
-
-					$list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
-					$list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment';
-					$list[$assoc['rate']]['datef'][] = $assoc['datef'];
-					$list[$assoc['rate']]['company_name'][] = '';
-					$list[$assoc['rate']]['company_id'][] = '';
-					$list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author'];
-					$list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
-					$list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
-
-					$list[$assoc['rate']]['facid'][] = $assoc['facid'];
-					$list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
-					$list[$assoc['rate']]['type'][] = $assoc['type'];
-					$list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
-					$list[$assoc['rate']]['descr'][] = $assoc['descr'];
-
-					$list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
-					$list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
-					$list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
-					$list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
-
-					$list[$assoc['rate']]['pid'][] = $assoc['pid'];
-					$list[$assoc['rate']]['pref'][] = $assoc['pref'];
-					$list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment';
-
-					$list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
-					$list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
-
-					$rate = $assoc['rate'];
-				}
-			}
-			else
-			{
-				dol_print_error($db);
-				return -3;
-			}
-		}
-	}
-
-	return $list;
+                        $list[$assoc['rate']]['localtax1'] += $assoc['total_localtax1'];
+                        $list[$assoc['rate']]['localtax2'] += $assoc['total_localtax2'];
+                    }
+
+                    $list[$assoc['rate']]['dtotal_ttc'][] = $assoc['total_ttc'];
+                    $list[$assoc['rate']]['dtype'][] = 'ExpenseReportPayment';
+                    $list[$assoc['rate']]['datef'][] = $assoc['datef'];
+                    $list[$assoc['rate']]['company_name'][] = '';
+                    $list[$assoc['rate']]['company_id'][] = '';
+                    $list[$assoc['rate']]['user_id'][] = $assoc['fk_user_author'];
+                    $list[$assoc['rate']]['ddate_start'][] = $db->jdate($assoc['date_start']);
+                    $list[$assoc['rate']]['ddate_end'][] = $db->jdate($assoc['date_end']);
+
+                    $list[$assoc['rate']]['facid'][] = $assoc['facid'];
+                    $list[$assoc['rate']]['facnum'][] = $assoc['facnum'];
+                    $list[$assoc['rate']]['type'][] = $assoc['type'];
+                    $list[$assoc['rate']]['ftotal_ttc'][] = $assoc['ftotal_ttc'];
+                    $list[$assoc['rate']]['descr'][] = $assoc['descr'];
+
+                    $list[$assoc['rate']]['totalht_list'][] = $assoc['total_ht'];
+                    $list[$assoc['rate']]['vat_list'][] = $assoc['total_vat'];
+                    $list[$assoc['rate']]['localtax1_list'][] = $assoc['total_localtax1'];
+                    $list[$assoc['rate']]['localtax2_list'][] = $assoc['total_localtax2'];
+
+                    $list[$assoc['rate']]['pid'][] = $assoc['pid'];
+                    $list[$assoc['rate']]['pref'][] = $assoc['pref'];
+                    $list[$assoc['rate']]['ptype'][] = 'ExpenseReportPayment';
+
+                    $list[$assoc['rate']]['payment_id'][] = $assoc['payment_id'];
+                    $list[$assoc['rate']]['payment_amount'][] = $assoc['payment_amount'];
+
+                    $rate = $assoc['rate'];
+                }
+            }
+            else
+            {
+                dol_print_error($db);
+                return -3;
+            }
+        }
+    }
+
+    return $list;
 }
 

dolibarr/htdocs/core/lib/ajax.lib.php

Indentation +49 added lines, -49 removed lines

@@ -55,11 +55,11 @@ 
 
     // Input search_htmlname is original field
     // Input htmlname is a second input field used when using ajax autocomplete.
-	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
+    $script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" />';
 
-	$script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
-	$script.= '<script type="text/javascript">'."\n";
-	$script.= '$(document).ready(function() {
+    $script.= '<!-- Javascript code for autocomplete of field '.$htmlname.' -->'."\n";
+    $script.= '<script type="text/javascript">'."\n";
+    $script.= '$(document).ready(function() {
 					var autoselect = '.$autoselect.';
 					var options = '.json_encode($ajaxoptions).';
 
@@ -202,9 +202,9 @@ 
 					};
 
   				});';
-	$script.= '</script>';
+    $script.= '</script>';
 
-	return $script;
+    return $script;
 }
 
 /**
@@ -223,9 +223,9 @@ 
  */
 function ajax_multiautocompleter($htmlname, $fields, $url, $option='', $minLength=2, $autoselect=0)
 {
-	$script = '<!-- Autocomplete -->'."\n";
-	$script.= '<script type="text/javascript">';
-	$script.= 'jQuery(document).ready(function() {
+    $script = '<!-- Autocomplete -->'."\n";
+    $script.= '<script type="text/javascript">';
+    $script.= 'jQuery(document).ready(function() {
 					var fields = '.json_encode($fields).';
 					var nboffields = fields.length;
 					var autoselect = '.$autoselect.';
@@ -314,9 +314,9 @@ 
     					}
 					});
   				});';
-	$script.= '</script>';
+    $script.= '</script>';
 
-	return $script;
+    return $script;
 }
 
 /**
@@ -330,12 +330,12 @@ 
  */
 function ajax_dialog($title,$message,$w=350,$h=150)
 {
-	global $langs;
+    global $langs;
 
-	$newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title;
-	$msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
-	$msg.= $message;
-	$msg.= '</div>'."\n";
+    $newtitle=dol_textishtml($title)?dol_string_nohtmltag($title,1):$title;
+    $msg= '<div id="dialog-info" title="'.dol_escape_htmltag($newtitle).'">';
+    $msg.= $message;
+    $msg.= '</div>'."\n";
     $msg.= '<script type="text/javascript">
     jQuery(function() {
         jQuery("#dialog-info").dialog({
@@ -373,17 +373,17 @@ 
  */
 function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $forcefocus=0, $widthTypeOfAutocomplete='resolve')
 {
-	global $conf;
+    global $conf;
 
-	// select2 disabled for smartphones with standard browser.
-	// TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array)
-	if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return '';
+    // select2 disabled for smartphones with standard browser.
+    // TODO With select2 v4, it seems ok, except that responsive style on table become crazy when scrolling at end of array)
+    if (! empty($conf->browser->layout) && $conf->browser->layout == 'phone') return '';
 
-	if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
-	if (empty($conf->use_javascript_ajax)) return '';
-	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
+    if (! empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
+    if (empty($conf->use_javascript_ajax)) return '';
+    if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && ! defined('REQUIRE_JQUERY_MULTISELECT')) return '';
 
-	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
+    if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete=0;
 
     $tmpplugin='select2';
     $msg="\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
@@ -410,12 +410,12 @@ 
 					},
 					dropdownCssClass: \'ui-dialog\'
 				})';
-	if ($forcefocus) $msg.= '.select2(\'focus\')';
-	$msg.= ';'."\n";
+    if ($forcefocus) $msg.= '.select2(\'focus\')';
+    $msg.= ';'."\n";
 
-	if (is_array($events) && count($events))    // If an array of js events to do were provided.
-	{
-		$msg.= '
+    if (is_array($events) && count($events))    // If an array of js events to do were provided.
+    {
+        $msg.= '
 			jQuery("#'.$htmlname.'").change(function () {
 				var obj = '.json_encode($events).';
 		   		$.each(obj, function(key,values) {
@@ -462,9 +462,9 @@ 
 						}
 				);
 			}';
-	}
+    }
 
-	$msg.= '});'."\n";
+    $msg.= '});'."\n";
     $msg.= "</script>\n";
 
     return $msg;
@@ -482,18 +482,18 @@ 
  */
 function ajax_constantonoff($code, $input=array(), $entity=null, $revertonoff=0, $strict=0)
 {
-	global $conf, $langs;
-
-	$entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
-
-	if (empty($conf->use_javascript_ajax))
-	{
-		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
-		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
-	}
-	else
-	{
-		$out= "\n<!-- Ajax code to switch constant ".$code." -->".'
+    global $conf, $langs;
+
+    $entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
+
+    if (empty($conf->use_javascript_ajax))
+    {
+        if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+        else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+    }
+    else
+    {
+        $out= "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script type="text/javascript">
 			$(document).ready(function() {
 				var input = '.json_encode($input).';
@@ -528,13 +528,13 @@ 
 			});
 		</script>'."\n";
 
-		$out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
-		$out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>';
-		$out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>';
-		$out.="\n";
-	}
+        $out.= '<div id="confirm_'.$code.'" title="" style="display: none;"></div>';
+        $out.= '<span id="set_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'hideobject':'').'">'.($revertonoff?img_picto($langs->trans("Enabled"),'switch_on'):img_picto($langs->trans("Disabled"),'switch_off')).'</span>';
+        $out.= '<span id="del_'.$code.'" class="linkobject '.(! empty($conf->global->$code)?'':'hideobject').'">'.($revertonoff?img_picto($langs->trans("Disabled"),'switch_off'):img_picto($langs->trans("Enabled"),'switch_on')).'</span>';
+        $out.="\n";
+    }
 
-	return $out;
+    return $out;
 }
 
 /**

dolibarr/htdocs/core/lib/invoice2.lib.php

Indentation +203 added lines, -203 removed lines

@@ -50,234 +50,234 @@
  */
 function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filter, $dateafterdate, $datebeforedate, $paymentdateafter, $paymentdatebefore, $usestdout, $regenerate=0, $filesuffix='', $paymentbankid='', $thirdpartiesid='', $fileprefix='mergedpdf')
 {
-	$sql = "SELECT DISTINCT f.rowid, f.ref";
-	$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
-	$sqlwhere='';
-	$sqlorder='';
-	if (in_array('all',$filter))
-	{
-		$sqlorder = " ORDER BY f.ref ASC";
-	}
-	if (in_array('date',$filter))
-	{
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'";
-		$sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'";
-		$sqlorder = " ORDER BY f.datef ASC";
-	}
-	if (in_array('nopayment',$filter))
-	{
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND pf.fk_paiement IS NULL";
-	}
-	if (in_array('payments',$filter) || in_array('bank',$filter))
-	{
-		$sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b";
-		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-		else $sqlwhere.=" AND";
-		$sqlwhere.= " f.fk_statut > 0";
-		$sqlwhere.= " AND f.rowid = pf.fk_facture";
-		$sqlwhere.= " AND pf.fk_paiement = p.rowid";
-		if (in_array('payments',$filter))
-		{
-			$sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
-			$sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
-		}
-		if (in_array('bank',$filter))
-		{
-			$sqlwhere.= " AND p.fk_bank = b.rowid";
-			$sqlwhere.= " AND b.fk_account = ".$paymentbankid;
-		}
-		$sqlorder = " ORDER BY p.datep ASC";
-	}
-	if (in_array('nodeposit',$filter))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 3';
-	}
-	if (in_array('noreplacement',$filter))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 1';
-	}
-	if (in_array('nocreditnote',$filter))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 2';
-	}
-	if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
-	}
-	if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid))
-	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
-	}
-	if ($sqlwhere) $sql.=$sqlwhere;
-	if ($sqlorder) $sql.=$sqlorder;
+    $sql = "SELECT DISTINCT f.rowid, f.ref";
+    $sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
+    $sqlwhere='';
+    $sqlorder='';
+    if (in_array('all',$filter))
+    {
+        $sqlorder = " ORDER BY f.ref ASC";
+    }
+    if (in_array('date',$filter))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.= " f.fk_statut > 0";
+        $sqlwhere.= " AND f.datef >= '".$db->idate($dateafterdate)."'";
+        $sqlwhere.= " AND f.datef <= '".$db->idate($datebeforedate)."'";
+        $sqlorder = " ORDER BY f.datef ASC";
+    }
+    if (in_array('nopayment',$filter))
+    {
+        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.= " f.fk_statut > 0";
+        $sqlwhere.= " AND pf.fk_paiement IS NULL";
+    }
+    if (in_array('payments',$filter) || in_array('bank',$filter))
+    {
+        $sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
+        if (in_array('bank',$filter)) $sql.= ", ".MAIN_DB_PREFIX."bank as b";
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.= " f.fk_statut > 0";
+        $sqlwhere.= " AND f.rowid = pf.fk_facture";
+        $sqlwhere.= " AND pf.fk_paiement = p.rowid";
+        if (in_array('payments',$filter))
+        {
+            $sqlwhere.= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
+            $sqlwhere.= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
+        }
+        if (in_array('bank',$filter))
+        {
+            $sqlwhere.= " AND p.fk_bank = b.rowid";
+            $sqlwhere.= " AND b.fk_account = ".$paymentbankid;
+        }
+        $sqlorder = " ORDER BY p.datep ASC";
+    }
+    if (in_array('nodeposit',$filter))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' type <> 3';
+    }
+    if (in_array('noreplacement',$filter))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' type <> 1';
+    }
+    if (in_array('nocreditnote',$filter))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' type <> 2';
+    }
+    if (in_array('excludethirdparties',$filter) && is_array($thirdpartiesid))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' f.fk_soc NOT IN ('.join(',',$thirdpartiesid).')';
+    }
+    if (in_array('onlythirdparties',$filter) && is_array($thirdpartiesid))
+    {
+        if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+        else $sqlwhere.=" AND";
+        $sqlwhere.=' f.fk_soc IN ('.join(',',$thirdpartiesid).')';
+    }
+    if ($sqlwhere) $sql.=$sqlwhere;
+    if ($sqlorder) $sql.=$sqlorder;
 
-	//print $sql; exit;
-	dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
+    //print $sql; exit;
+    dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
 
-	if ($usestdout) print '--- start'."\n";
+    if ($usestdout) print '--- start'."\n";
 
-	// Start of transaction
-	//$db->begin();
+    // Start of transaction
+    //$db->begin();
 
-	$error = 0;
-	$result = 0;
-	$files = array() ;		// liste les fichiers
+    $error = 0;
+    $result = 0;
+    $files = array() ;		// liste les fichiers
 
-	dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
-	if ( $resql=$db->query($sql) )
-	{
-	    $num = $db->num_rows($resql);
-	    $cpt = 0;
-	    $oldemail = '';
-	    $message = '';
-	    $total = '';
+    dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
+    if ( $resql=$db->query($sql) )
+    {
+        $num = $db->num_rows($resql);
+        $cpt = 0;
+        $oldemail = '';
+        $message = '';
+        $total = '';
 
-	    if ($num)
-	    {
-	    	// First loop on each resultset to build PDF
-	    	// -----------------------------------------
+        if ($num)
+        {
+            // First loop on each resultset to build PDF
+            // -----------------------------------------
 
-	        while ($cpt < $num)
-	        {
-	            $obj = $db->fetch_object($resql);
+            while ($cpt < $num)
+            {
+                $obj = $db->fetch_object($resql);
 
-				$fac = new Facture($db);
-				$result=$fac->fetch($obj->rowid);
-				if ($result > 0)
-				{
-					$outputlangs = $langs;
-					if (! empty($newlangid))
-					{
-						if ($outputlangs->defaultlang != $newlangid)
-						{
-							$outputlangs = new Translate("",$conf);
-							$outputlangs->setDefaultLang($newlangid);
-						}
-					}
-					$filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
-					if ($regenerate || ! dol_is_file($filename))
-					{
-	            	    if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
-	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
-					}
-					else {
-					    if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
-					}
+                $fac = new Facture($db);
+                $result=$fac->fetch($obj->rowid);
+                if ($result > 0)
+                {
+                    $outputlangs = $langs;
+                    if (! empty($newlangid))
+                    {
+                        if ($outputlangs->defaultlang != $newlangid)
+                        {
+                            $outputlangs = new Translate("",$conf);
+                            $outputlangs->setDefaultLang($newlangid);
+                        }
+                    }
+                    $filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
+                    if ($regenerate || ! dol_is_file($filename))
+                    {
+                        if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+                        $result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
+                    }
+                    else {
+                        if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
+                    }
 
-					// Add file into files array
-					$files[] = $filename;
-				}
+                    // Add file into files array
+                    $files[] = $filename;
+                }
 
-				if ($result <= 0)
-				{
-					$error++;
-					if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n";
-					else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
-				}
+                if ($result <= 0)
+                {
+                    $error++;
+                    if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid)."\n";
+                    else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
+                }
 
-	            $cpt++;
-	        }
+                $cpt++;
+            }
 
 
-	        // Define format of output PDF
-	        $formatarray=pdf_getFormat($langs);
-	        $page_largeur = $formatarray['width'];
-	        $page_hauteur = $formatarray['height'];
-	        $format = array($page_largeur,$page_hauteur);
+            // Define format of output PDF
+            $formatarray=pdf_getFormat($langs);
+            $page_largeur = $formatarray['width'];
+            $page_hauteur = $formatarray['height'];
+            $format = array($page_largeur,$page_hauteur);
 
-	        if ($usestdout) print "Using output PDF format ".join('x',$format)."\n";
-	        else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR);
+            if ($usestdout) print "Using output PDF format ".join('x',$format)."\n";
+            else dol_syslog("Using output PDF format ".join('x',$format), LOG_ERR);
 
 
-	        // Now, build a merged files with all files in $files array
-			//---------------------------------------------------------
+            // Now, build a merged files with all files in $files array
+            //---------------------------------------------------------
 
-	        // Create empty PDF
-	        $pdf=pdf_getInstance($format);
-	        if (class_exists('TCPDF'))
-	        {
-	            $pdf->setPrintHeader(false);
-	            $pdf->setPrintFooter(false);
-	        }
-	        $pdf->SetFont(pdf_getPDFFont($langs));
+            // Create empty PDF
+            $pdf=pdf_getInstance($format);
+            if (class_exists('TCPDF'))
+            {
+                $pdf->setPrintHeader(false);
+                $pdf->setPrintFooter(false);
+            }
+            $pdf->SetFont(pdf_getPDFFont($langs));
 
-	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
-			//$pdf->SetCompression(false);
+            if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
+            //$pdf->SetCompression(false);
 
-			// Add all others
-			foreach($files as $file)
-			{
-	            if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
-	            else dol_syslog("Merge PDF file for invoice ".$file);
+            // Add all others
+            foreach($files as $file)
+            {
+                if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
+                else dol_syslog("Merge PDF file for invoice ".$file);
 
-				// Charge un document PDF depuis un fichier.
-				$pagecount = $pdf->setSourceFile($file);
-				for ($i = 1; $i <= $pagecount; $i++)
-	            {
-	                 $tplidx = $pdf->importPage($i);
-	                 $s = $pdf->getTemplatesize($tplidx);
-	                 $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-	                 $pdf->useTemplate($tplidx);
-	            }
-			}
+                // Charge un document PDF depuis un fichier.
+                $pagecount = $pdf->setSourceFile($file);
+                for ($i = 1; $i <= $pagecount; $i++)
+                {
+                        $tplidx = $pdf->importPage($i);
+                        $s = $pdf->getTemplatesize($tplidx);
+                        $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+                        $pdf->useTemplate($tplidx);
+                }
+            }
 
-			// Create output dir if not exists
-			dol_mkdir($diroutputpdf);
+            // Create output dir if not exists
+            dol_mkdir($diroutputpdf);
 
-			// Save merged file
-			$filename=$fileprefix;
-			if (empty($filename)) $filename='mergedpdf';
-			if (! empty($filesuffix)) $filename.='_'.$filesuffix;
-			$file=$diroutputpdf.'/'.$filename.'.pdf';
+            // Save merged file
+            $filename=$fileprefix;
+            if (empty($filename)) $filename='mergedpdf';
+            if (! empty($filesuffix)) $filename.='_'.$filesuffix;
+            $file=$diroutputpdf.'/'.$filename.'.pdf';
 
-			if (! $error && $pagecount)
-			{
-				$pdf->Output($file,'F');
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
-			}
+            if (! $error && $pagecount)
+            {
+                $pdf->Output($file,'F');
+                if (! empty($conf->global->MAIN_UMASK))
+                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+            }
 
-			if ($usestdout)
-			{
-				if (! $error) print "Merged PDF has been built in ".$file."\n";
-				else print "Can't build PDF ".$file."\n";
-			}
+            if ($usestdout)
+            {
+                if (! $error) print "Merged PDF has been built in ".$file."\n";
+                else print "Can't build PDF ".$file."\n";
+            }
 
-			$result = 1;
-	    }
-	    else
-	    {
-	        if ($usestdout) print "No invoices found for criteria.\n";
-	        else dol_syslog("No invoices found for criteria");
-	        $result = 0;
-	    }
-	}
-	else
-	{
-	    dol_print_error($db);
-	    dol_syslog("scripts/invoices/rebuild_merge.php: Error");
-	    $error++;
-	}
+            $result = 1;
+        }
+        else
+        {
+            if ($usestdout) print "No invoices found for criteria.\n";
+            else dol_syslog("No invoices found for criteria");
+            $result = 0;
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+        dol_syslog("scripts/invoices/rebuild_merge.php: Error");
+        $error++;
+    }
 
-	if ($error) return -1;
-	else return $result;
+    if ($error) return -1;
+    else return $result;
 }
 

dolibarr/htdocs/core/lib/prelevement.lib.php

Indentation +24 added lines, -24 removed lines

@@ -33,31 +33,31 @@ 
  */
 function prelevement_prepare_head(BonPrelevement $object)
 {
-	global $langs, $conf, $user;
-	$langs->load("withdrawals");
+    global $langs, $conf, $user;
+    $langs->load("withdrawals");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'prelevement';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'prelevement';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Bills");
-	$head[$h][2] = 'invoices';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Bills");
+    $head[$h][2] = 'invoices';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Rejects");
-	$head[$h][2] = 'rejects';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Rejects");
+    $head[$h][2] = 'rejects';
+    $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Statistics");
-	$head[$h][2] = 'statistics';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Statistics");
+    $head[$h][2] = 'statistics';
+    $h++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -77,10 +77,10 @@ 
  */
 function prelevement_check_config()
 {
-	global $conf;
-	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
-	if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
+    global $conf;
+    if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
+    if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
     if(empty($conf->global->PRELEVEMENT_USER)) return -1;
-	return 0;
+    return 0;
 }
 

dolibarr/htdocs/core/lib/barcode.lib.php

Indentation +8 added lines, -8 removed lines

@@ -226,8 +226,8 @@ 
     return array(
         "error" => '',
         "encoding" => $encoding,
-		"bars" => $line,
-		"text" => $text
+        "bars" => $line,
+        "text" => $text
     );
 }
 
@@ -271,16 +271,16 @@ 
     }
     //var_dump($bars);
     $ret=array(
-		"bars" => trim($bars),
-		"text" => trim($text),
-		"encoding" => trim($encoding),
-    	"error" => ""
+        "bars" => trim($bars),
+        "text" => trim($text),
+        "encoding" => trim($encoding),
+        "error" => ""
     );
     //var_dump($ret);
     if (preg_match('/permission denied/i',$ret['bars']))
     {
-    	$ret['error']=$ret['bars']; $ret['bars']='';
-    	return $ret;
+        $ret['error']=$ret['bars']; $ret['bars']='';
+        return $ret;
     }
     if (!$ret['bars']) return false;
     if (!$ret['text']) return false;

dolibarr/htdocs/core/lib/accounting.lib.php

Indentation +54 added lines, -54 removed lines

@@ -31,25 +31,25 @@ 
  */
 function accounting_prepare_head(AccountingAccount $object)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array ();
+    $h = 0;
+    $head = array ();
 
-	$head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h ++;
+    $head[$h][0] = DOL_URL_ROOT.'/accountancy/admin/card.php?id=' . $object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h ++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
-	// $this->tabs = array('entity:-tabname); to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+    // $this->tabs = array('entity:-tabname); to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account', 'remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'accounting_account', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -60,9 +60,9 @@ 
  */
 function clean_account($account)
 {
-	$account = rtrim($account,"0");
+    $account = rtrim($account,"0");
 
-	return $account;
+    return $account;
 }
 
 /**
@@ -73,31 +73,31 @@ 
  */
 function length_accountg($account)
 {
-	global $conf;
+    global $conf;
 
-	if ($account < 0 || empty($account)) return '';
+    if ($account < 0 || empty($account)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+    if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
 
-	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
-	if (! empty($g)) {
-		// Clean parameters
-		$i = strlen($account);
+    $g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
+    if (! empty($g)) {
+        // Clean parameters
+        $i = strlen($account);
 
-		if ($i >= 1) {
-			while ( $i < $g ) {
-				$account .= '0';
+        if ($i >= 1) {
+            while ( $i < $g ) {
+                $account .= '0';
 
-				$i ++;
-			}
+                $i ++;
+            }
 
-			return $account;
-		} else {
-			return $account;
-		}
-	} else {
-		return $account;
-	}
+            return $account;
+        } else {
+            return $account;
+        }
+    } else {
+        return $account;
+    }
 }
 
 /**
@@ -108,31 +108,31 @@ 
  */
 function length_accounta($accounta)
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	if ($accounta < 0 || empty($accounta)) return '';
+    if ($accounta < 0 || empty($accounta)) return '';
 
-	if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+    if (! empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
 
-	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
-	if (! empty($a)) {
-		// Clean parameters
-		$i = strlen($accounta);
+    $a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
+    if (! empty($a)) {
+        // Clean parameters
+        $i = strlen($accounta);
 
-		if ($i >= 1) {
-			while ( $i < $a ) {
-				$accounta .= '0';
+        if ($i >= 1) {
+            while ( $i < $a ) {
+                $accounta .= '0';
 
-				$i ++;
-			}
+                $i ++;
+            }
 
-			return $accounta;
-		} else {
-			return $accounta;
-		}
-	} else {
-		return $accounta;
-	}
+            return $accounta;
+        } else {
+            return $accounta;
+        }
+    } else {
+        return $accounta;
+    }
 }
 
 

dolibarr/htdocs/core/lib/resource.lib.php

Indentation +77 added lines, -77 removed lines

@@ -31,70 +31,70 @@ 
  */
 function resource_prepare_head($object)
 {
-	global $langs, $conf, $user;
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = dol_buildpath('/resource/card.php',1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("ResourceCard");
-    	$head[$h][2] = 'resource';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
-
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'resource');
-
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
-		$nbNote = 0;
-		if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-		$head[$h][2] = 'note';
-		$h++;
-	}
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	$upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
-	$head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Events");
-	if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
-	{
-		$head[$h][1].= '/';
-		$head[$h][1].= $langs->trans("Agenda");
-	}
-	$head[$h][2] = 'agenda';
-	$h++;
-
-	/*$head[$h][0] = DOL_URL_ROOT.'/resource/info.php?id='.$object->id;
+    global $langs, $conf, $user;
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = dol_buildpath('/resource/card.php',1).'?id='.$object->id;
+    $head[$h][1] = $langs->trans("ResourceCard");
+        $head[$h][2] = 'resource';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('ContactsAddresses');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'resource');
+
+    if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+    {
+        $nbNote = 0;
+        if(!empty($object->note_private)) $nbNote++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
+    }
+
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    $upload_dir = $conf->resource->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Documents");
+    if($nbFiles > 0) $head[$h][1].= ' <span class="badge">'.$nbFiles.'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
+
+    $head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Events");
+    if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
+    {
+        $head[$h][1].= '/';
+        $head[$h][1].= $langs->trans("Agenda");
+    }
+    $head[$h][2] = 'agenda';
+    $h++;
+
+    /*$head[$h][0] = DOL_URL_ROOT.'/resource/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
 	$head[$h][2] = 'info';
 	$h++;*/
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'resource', 'remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'resource', 'remove');
 
-	return $head;
+    return $head;
 }
 
 /**
@@ -105,28 +105,28 @@ 
 function resource_admin_prepare_head()
 {
 
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/resource.php';
-	$head[$h][1] = $langs->trans("ResourceSetup");
-	$head[$h][2] = 'general';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/resource.php';
+    $head[$h][1] = $langs->trans("ResourceSetup");
+    $head[$h][2] = 'general';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/resource_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/resource_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][2] = 'attributes';
+    $h++;
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'resource_admin','remove');
 
-	return $head;
+    return $head;
 }

dolibarr/htdocs/core/lib/ws.lib.php

Indentation +21 added lines, -21 removed lines

@@ -65,32 +65,32 @@
             $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
         }
 
-		if (! $error && $fuser->statut == 0)
-		{
-			$error++;
-			$errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled';
-		}
+        if (! $error && $fuser->statut == 0)
+        {
+            $error++;
+            $errorcode='ERROR_USER_DISABLED'; $errorlabel='This user has been locked or disabled';
+        }
 
-    	// Validation of login
-		if (! $error)
-		{
-			$fuser->getrights();	// Load permission of user
+        // Validation of login
+        if (! $error)
+        {
+            $fuser->getrights();	// Load permission of user
 
-        	// Authentication mode
-        	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
-        	// Authentication mode: forceuser
-        	if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
-        	// Set authmode
-        	$authmode=explode(',',$dolibarr_main_authentication);
+            // Authentication mode
+            if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication='http,dolibarr';
+            // Authentication mode: forceuser
+            if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+            // Set authmode
+            $authmode=explode(',',$dolibarr_main_authentication);
 
             include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-        	$login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode);
-			if (empty($login))
-			{
-			    $error++;
+            $login = checkLoginPassEntity($authentication['login'],$authentication['password'],$authentication['entity'],$authmode);
+            if (empty($login))
+            {
+                $error++;
                 $errorcode='BAD_CREDENTIALS'; $errorlabel='Bad value for login or password';
-			}
-		}
+            }
+        }
     }
 
     return $fuser;

dolibarr/htdocs/core/lib/fichinter.lib.php

Indentation +91 added lines, -91 removed lines

@@ -35,26 +35,26 @@ 
  */
 function fichinter_prepare_head($object)
 {
-	global $db, $langs, $conf, $user;
-	$langs->load("fichinter");
-
-	$h = 0;
-	$head = array();
-
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Card");
-	$head[$h][2] = 'card';
-	$h++;
-
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
-	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
-	    $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
-		$head[$h][1] = $langs->trans('InterventionContact');
-		if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
-		$head[$h][2] = 'contact';
-		$h++;
-	}
+    global $db, $langs, $conf, $user;
+    $langs->load("fichinter");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/card.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
+
+    if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+    {
+        $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
+        $head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('InterventionContact');
+        if ($nbContact > 0) $head[$h][1].= ' <span class="badge">'.$nbContact.'</span>';
+        $head[$h][2] = 'contact';
+        $h++;
+    }
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -62,58 +62,58 @@ 
     // $this->tabs = array('entity:-tabname);   												to remove a tab
     complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention');
 
-	// Tab to link resources
-	if ($conf->resource->enabled)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
- 		$nbResource = 0;
-		$objectres=new Dolresource($db);
-		if (is_array($objectres->available_resources))
-		{
-	 		foreach ($objectres->available_resources as $modresources => $resources)
-			{
-				$resources=(array) $resources;  // To be sure $resources is an array
-				foreach($resources as $resource_obj)
-				{
-					$linked_resources = $object->getElementResources('fichinter',$object->id,$resource_obj);
-				}
-			}
-		}
-
-   		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
-		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResource > 0) $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
-		$head[$h][2] = 'resource';
-		$h++;
-	}
+    // Tab to link resources
+    if ($conf->resource->enabled)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
+            $nbResource = 0;
+        $objectres=new Dolresource($db);
+        if (is_array($objectres->available_resources))
+        {
+                foreach ($objectres->available_resources as $modresources => $resources)
+            {
+                $resources=(array) $resources;  // To be sure $resources is an array
+                foreach($resources as $resource_obj)
+                {
+                    $linked_resources = $object->getElementResources('fichinter',$object->id,$resource_obj);
+                }
+            }
+        }
+
+            $head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
+        $head[$h][1] = $langs->trans("Resources");
+        if ($nbResource > 0) $head[$h][1].= ' <span class="badge">'.$nbResource.'</span>';
+        $head[$h][2] = 'resource';
+        $h++;
+    }
 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
-    	$nbNote = 0;
+        $nbNote = 0;
         if(!empty($object->note_private)) $nbNote++;
-		if(!empty($object->note_public)) $nbNote++;
-    	$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
-    	$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
-    	$head[$h][2] = 'note';
-    	$h++;
+        if(!empty($object->note_public)) $nbNote++;
+        $head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
+        $head[$h][1] = $langs->trans('Notes');
+        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        $head[$h][2] = 'note';
+        $h++;
     }
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->ficheinter->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
+    $upload_dir = $conf->ficheinter->dir_output . "/" . dol_sanitizeFileName($object->ref);
+    $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     $nbLinks=Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
-	$head[$h][2] = 'documents';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("Documents");
+    if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    $head[$h][2] = 'documents';
+    $h++;
 
     $head[$h][0] = DOL_URL_ROOT.'/fichinter/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
-	$h++;
+    $head[$h][1] = $langs->trans('Info');
+    $head[$h][2] = 'info';
+    $h++;
 
     complete_head_from_modules($conf,$langs,$object,$head,$h,'intervention','remove');
 
@@ -127,39 +127,39 @@ 
  */
 function fichinter_admin_prepare_head()
 {
-	global $langs, $conf, $user;
+    global $langs, $conf, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$h = 0;
+    $h = 0;
 
-	$head[$h][0] = DOL_URL_ROOT."/admin/fichinter.php";
-	$head[$h][1] = $langs->trans("Interventions");
-	$head[$h][2] = 'ficheinter';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/admin/fichinter.php";
+    $head[$h][1] = $langs->trans("Interventions");
+    $head[$h][2] = 'ficheinter';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+    // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+    complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFields");
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFields");
     $head[$h][2] = 'attributes';
     $h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsLines");
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
+    $head[$h][1] = $langs->trans("ExtraFieldsLines");
     $head[$h][2] = 'attributesdet';
     $h++;
 
 
 
-	complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin','remove');
+    complete_head_from_modules($conf,$langs,null,$head,$h,'fichinter_admin','remove');
 
-		return $head;
+        return $head;
 }
 
 /**
@@ -170,20 +170,20 @@ 
  */
 function fichinter_rec_prepare_head($object)
 {
-	global $langs, $conf; //, $user;
+    global $langs, $conf; //, $user;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("CardFichinter");
-	$head[$h][2] = 'card';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("CardFichinter");
+    $head[$h][2] = 'card';
+    $h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec');
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention-rec');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h,'intervention-rec','remove');
+    complete_head_from_modules($conf, $langs, $object, $head, $h,'intervention-rec','remove');
 
 
-	return $head;
+    return $head;
 }