alxarafe / alixar

dolibarr/htdocs/margin/customerMargins.php

Indentation +154 added lines, -154 removed lines

@@ -58,9 +58,9 @@ 
 $startdate=$enddate='';
 
 if (!empty($_POST['startdatemonth']))
-  $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
+    $startdate  = dol_mktime(0, 0, 0, $_POST['startdatemonth'],  $_POST['startdateday'],  $_POST['startdateyear']);
 if (!empty($_POST['enddatemonth']))
-  $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
+    $enddate  = dol_mktime(23, 59, 59, $_POST['enddatemonth'],  $_POST['enddateday'],  $_POST['enddateyear']);
 
 
 /*
@@ -92,28 +92,28 @@ 
 $client = false;
 if ($socid > 0) {
 
-	$soc = new Societe($db);
-	$soc->fetch($socid);
-
-	if ($soc->client)
-	{
-		print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
-		print '<td class="maxwidthonsmartphone" colspan="4">';
-		print $form->select_company($socid, 'socid', 'client=1 OR client=3', 1, 0, 0);
-		//$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
-		print '</td></tr>';
-
-		$client = true;
-		if (! $sortorder) $sortorder="DESC";
-		if (! $sortfield) $sortfield="f.datef";
-	}
+    $soc = new Societe($db);
+    $soc->fetch($socid);
+
+    if ($soc->client)
+    {
+        print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
+        print '<td class="maxwidthonsmartphone" colspan="4">';
+        print $form->select_company($socid, 'socid', 'client=1 OR client=3', 1, 0, 0);
+        //$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$socid,$socid,'socid','client=1 OR client=3',1,0,1);
+        print '</td></tr>';
+
+        $client = true;
+        if (! $sortorder) $sortorder="DESC";
+        if (! $sortfield) $sortfield="f.datef";
+    }
 }
 else {
-	print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
-	print '<td class="maxwidthonsmartphone" colspan="4">';
-	print $form->select_company(null, 'socid', 'client=1 OR client=3', 1, 0, 0);
-	//$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
-	print '</td></tr>';
+    print '<tr><td class="titlefield">'.$langs->trans('ThirdPartyName').'</td>';
+    print '<td class="maxwidthonsmartphone" colspan="4">';
+    print $form->select_company(null, 'socid', 'client=1 OR client=3', 1, 0, 0);
+    //$form->form_thirdparty($_SERVER['PHP_SELF'],null,'socid','client=1 OR client=3',1,0,1);
+    print '</td></tr>';
 }
 
 $sortfield = GETPOST("sortfield",'alpha');
@@ -121,16 +121,16 @@ 
 if (! $sortorder) $sortorder="ASC";
 if (! $sortfield)
 {
-	if ($client)
-	{
-		$sortfield="f.datef";
-		$sortorder="DESC";
-	}
-	else
-	{
-	    $sortfield="s.nom";
-	    $sortorder="ASC";
-	}
+    if ($client)
+    {
+        $sortfield="f.datef";
+        $sortorder="DESC";
+    }
+    else
+    {
+        $sortfield="s.nom";
+        $sortorder="ASC";
+    }
 }
 
 // Products
@@ -138,7 +138,7 @@ 
 
 $TProducts = array();
 foreach($TRes as $prod) {
-	$TProducts[$prod['key']] = $prod['label'];
+    $TProducts[$prod['key']] = $prod['label'];
 }
 
 print '<tr><td class="titlefield">'.$langs->trans('ChooseProduct/Service').'</td>';
@@ -182,16 +182,16 @@ 
 
 // Margin Rate
 if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
-	print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
-	print '<span id="marginRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="4">';
+    print '<span id="marginRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 // Mark Rate
 if (! empty($conf->global->DISPLAY_MARK_RATES)) {
-	print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
-	print '<span id="markRate"></span>'; // set by jquery (see below)
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="4">';
+    print '<span id="markRate"></span>'; // set by jquery (see below)
+    print '</td></tr>';
 }
 
 print "</table>";
@@ -211,7 +211,7 @@ 
 $sql.= ", ".MAIN_DB_PREFIX."facture as f";
 $sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
 if(! empty($TSelectedCats)) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product';
+    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product';
 }
 
 if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -223,10 +223,10 @@ 
 $sql.= " AND d.fk_facture = f.rowid";
 $sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
 if(! empty($TSelectedProducts)) {
-	$sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts) . ')';
+    $sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts) . ')';
 }
 if(! empty($TSelectedCats)) {
-	$sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
+    $sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')';
 }
 if (!empty($startdate))
 $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
@@ -245,127 +245,127 @@ 
 $result = $db->query($sql);
 if ($result)
 {
-	$num = $db->num_rows($result);
-
-  	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
-
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
-
-	$i = 0;
-	print "<table class=\"noborder\" width=\"100%\">";
-
-	print '<tr class="liste_titre">';
-	if (! empty($client)) {
-  		print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;socid=".$socid,'',$sortfield,$sortorder);
-  		print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$socid,'align="center"',$sortfield,$sortorder);
-	}
-	else
-  		print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;socid=".$socid,'',$sortfield,$sortorder);
-	print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
-	print "</tr>\n";
-
-	$cumul_achat = 0;
-	$cumul_vente = 0;
-
-	$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
-
-	if ($num > 0)
-	{
-		while ($i < $num /*&& $i < $conf->liste_limit*/)
-		{
-			$objp = $db->fetch_object($result);
-
-			$pa = $objp->buying_price;
-			$pv = $objp->selling_price;
-			$marge = $objp->marge;
-
-			if ($marge < 0)
-			{
-				$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
-			}
-			else
-			{
-				$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
-				$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
-			}
-
-			print '<tr class="oddeven">';
-			if ($client) {
-		        print '<td>';
-				$invoicestatic->id=$objp->facid;
-				$invoicestatic->ref=$objp->ref;
-				print $invoicestatic->getNomUrl(1);
-				print "</td>\n";
-				print "<td align=\"center\">";
-				print dol_print_date($db->jdate($objp->datef),'day')."</td>";
-		  	}
-		  	else {
-				$companystatic->id=$objp->socid;
-				$companystatic->name=$objp->name;
-				$companystatic->client=$objp->client;
-		   		print "<td>".$companystatic->getNomUrl(1,'margin')."</td>\n";
-		  	}
-
-			print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
-			print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-			print "</tr>\n";
-
-			$i++;
-			$cumul_achat += $objp->buying_price;
-			$cumul_vente += $objp->selling_price;
-		}
-	}
-
-	// affichage totaux marges
-
-	$totalMargin = $cumul_vente - $cumul_achat;
-	/*if ($totalMargin < 0)
+    $num = $db->num_rows($result);
+
+        print '<br>';
+    print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num, $num, '', 0, '', '', 0, 1);
+
+    if ($conf->global->MARGIN_TYPE == "1")
+        $labelcostprice='BuyingPrice';
+    else   // value is 'costprice' or 'pmp'
+        $labelcostprice='CostPrice';
+
+    $i = 0;
+    print "<table class=\"noborder\" width=\"100%\">";
+
+    print '<tr class="liste_titre">';
+    if (! empty($client)) {
+            print_liste_field_titre("Invoice",$_SERVER["PHP_SELF"],"f.ref","","&amp;socid=".$socid,'',$sortfield,$sortorder);
+            print_liste_field_titre("DateInvoice",$_SERVER["PHP_SELF"],"f.datef","","&amp;socid=".$socid,'align="center"',$sortfield,$sortorder);
+    }
+    else
+            print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","","&amp;socid=".$socid,'',$sortfield,$sortorder);
+    print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+        print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+    if (! empty($conf->global->DISPLAY_MARK_RATES))
+        print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","","&amp;socid=".$socid,'align="right"',$sortfield,$sortorder);
+    print "</tr>\n";
+
+    $cumul_achat = 0;
+    $cumul_vente = 0;
+
+    $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
+
+    if ($num > 0)
+    {
+        while ($i < $num /*&& $i < $conf->liste_limit*/)
+        {
+            $objp = $db->fetch_object($result);
+
+            $pa = $objp->buying_price;
+            $pv = $objp->selling_price;
+            $marge = $objp->marge;
+
+            if ($marge < 0)
+            {
+                $marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ;
+            }
+            else
+            {
+                $marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
+                $markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
+            }
+
+            print '<tr class="oddeven">';
+            if ($client) {
+                print '<td>';
+                $invoicestatic->id=$objp->facid;
+                $invoicestatic->ref=$objp->ref;
+                print $invoicestatic->getNomUrl(1);
+                print "</td>\n";
+                print "<td align=\"center\">";
+                print dol_print_date($db->jdate($objp->datef),'day')."</td>";
+                }
+                else {
+                $companystatic->id=$objp->socid;
+                $companystatic->name=$objp->name;
+                $companystatic->client=$objp->client;
+                    print "<td>".$companystatic->getNomUrl(1,'margin')."</td>\n";
+                }
+
+            print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
+            print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
+            print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+            print "</tr>\n";
+
+            $i++;
+            $cumul_achat += $objp->buying_price;
+            $cumul_vente += $objp->selling_price;
+        }
+    }
+
+    // affichage totaux marges
+
+    $totalMargin = $cumul_vente - $cumul_achat;
+    /*if ($totalMargin < 0)
 	{
 		$marginRate = ($cumul_achat != 0)?-1*(100 * $totalMargin / $cumul_achat):'';
 		$markRate = ($cumul_vente != 0)?-1*(100 * $totalMargin / $cumul_vente):'';
 	}
 	else
 	{*/
-		$marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
-		$markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
-	//}
-
-	print '<tr class="liste_total">';
-	if ($client)
-	    print '<td colspan=2>';
-  	else
-    	print '<td>';
-  	print $langs->trans('TotalMargin')."</td>";
-	print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
-	print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
-	print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-		print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
-	if (! empty($conf->global->DISPLAY_MARK_RATES))
-		print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
-	print "</tr>\n";
-
-  print "</table>";
+        $marginRate = ($cumul_achat != 0)?(100 * $totalMargin / $cumul_achat):'';
+        $markRate = ($cumul_vente != 0)?(100 * $totalMargin / $cumul_vente):'';
+    //}
+
+    print '<tr class="liste_total">';
+    if ($client)
+        print '<td colspan=2>';
+        else
+        print '<td>';
+        print $langs->trans('TotalMargin')."</td>";
+    print "<td align=\"right\">".price($cumul_vente, null, null, null, null, $rounding)."</td>\n";
+    print "<td align=\"right\">".price($cumul_achat, null, null, null, null, $rounding)."</td>\n";
+    print "<td align=\"right\">".price($totalMargin, null, null, null, null, $rounding)."</td>\n";
+    if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+        print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
+    if (! empty($conf->global->DISPLAY_MARK_RATES))
+        print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
+    print "</tr>\n";
+
+    print "</table>";
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 $db->free($result);
 

dolibarr/htdocs/margin/checkMargins.php

Indentation +88 added lines, -88 removed lines

@@ -201,115 +201,115 @@
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 
-	dol_syslog(__FILE__, LOG_DEBUG);
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    dol_syslog(__FILE__, LOG_DEBUG);
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql .= $db->plimit($limit+1, $offset);
 
 $result = $db->query($sql);
 if ($result) {
-	$num = $db->num_rows($result);
+    $num = $db->num_rows($result);
 
-	print '<br>';
-	print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+    print '<br>';
+    print_barre_liste($langs->trans("MarginDetails"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-	if ($conf->global->MARGIN_TYPE == "1")
-	    $labelcostprice='BuyingPrice';
-	else   // value is 'costprice' or 'pmp'
-	    $labelcostprice='CostPrice';
+    if ($conf->global->MARGIN_TYPE == "1")
+        $labelcostprice='BuyingPrice';
+    else   // value is 'costprice' or 'pmp'
+        $labelcostprice='CostPrice';
 
-	$moreforfilter='';
+    $moreforfilter='';
 
-	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-	//$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-	//if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-	$selectedfields='';
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    //$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    //if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+    $selectedfields='';
 
     print '<div class="div-table-responsive">';
     print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
 
-	print '<tr class="liste_titre liste_titre_search">';
-	print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
-	print '<td></td>';
-	print '<td></td>';
-	print '<td></td>';
-	print '<td></td>';
-	print '<td></td>';
+    print '<tr class="liste_titre liste_titre_search">';
+    print '<td><input type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
+    print '<td></td>';
+    print '<td></td>';
+    print '<td></td>';
+    print '<td></td>';
+    print '<td></td>';
     print '<td class="liste_titre" align="middle">';
     $searchpitco=$form->showFilterButtons();
     print $searchpitco;
     print '</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", $param, 'width=20%', $sortfield, $sortorder);
-	print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "d.subprice", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'',$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
-	print "</tr>\n";
+    print "</tr>\n";
+
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+    print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "", "", $param, 'width=20%', $sortfield, $sortorder);
+    print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "d.subprice", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "d.buy_price_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'',$param,'align="center"',$sortfield,$sortorder,'maxwidthsearch ');
+    print "</tr>\n";
 
     $i=0;
-	while ($i < min($num, $limit))
-	{
-	    $objp = $db->fetch_object($result);
-
-		print '<tr class="oddeven">';
-		print '<td>';
-		$result_inner = $invoicestatic->fetch($objp->invoiceid);
-		if ($result_inner < 0) {
-			setEventMessages($invoicestatic->error, null, 'errors');
-		} else {
-			print $invoicestatic->getNomUrl(1);
-		}
-		print '</td>';
-		print '<td>';
-		if (! empty($objp->fk_product)) {
-			$result_inner = $productstatic->fetch($objp->fk_product);
-			if ($result_inner < 0) {
-				setEventMessages($productstatic->error, null, 'errors');
-			} else {
-				print $productstatic->getNomUrl(1);
-			}
-		} else {
-			print $objp->label;
-			print '&nbsp;';
-			print $objp->description;
-		}
-		print '</td>';
-		print '<td align="right">';
-		print price($objp->subprice);
-		print '</td>';
-		print '<td align="right">';
-		print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="right flat">';
-		print '</td>';
-		print '<td align="right">';
-		print $objp->qty;
-		print '</td>';
-		print '<td align="right">';
-		print price($objp->total_ht);
-		print '</td>';
-		print '<td></td>';
-
-		print "</tr>\n";
-
-		$i ++;
-	}
-
-	print "</table>";
-
-	print "</div>";
+    while ($i < min($num, $limit))
+    {
+        $objp = $db->fetch_object($result);
+
+        print '<tr class="oddeven">';
+        print '<td>';
+        $result_inner = $invoicestatic->fetch($objp->invoiceid);
+        if ($result_inner < 0) {
+            setEventMessages($invoicestatic->error, null, 'errors');
+        } else {
+            print $invoicestatic->getNomUrl(1);
+        }
+        print '</td>';
+        print '<td>';
+        if (! empty($objp->fk_product)) {
+            $result_inner = $productstatic->fetch($objp->fk_product);
+            if ($result_inner < 0) {
+                setEventMessages($productstatic->error, null, 'errors');
+            } else {
+                print $productstatic->getNomUrl(1);
+            }
+        } else {
+            print $objp->label;
+            print '&nbsp;';
+            print $objp->description;
+        }
+        print '</td>';
+        print '<td align="right">';
+        print price($objp->subprice);
+        print '</td>';
+        print '<td align="right">';
+        print '<input type="text" name="buyingprice_' . $objp->invoicedetid . '" id="buyingprice_' . $objp->invoicedetid . '" size="6" value="' . price($objp->buy_price_ht) . '" class="right flat">';
+        print '</td>';
+        print '<td align="right">';
+        print $objp->qty;
+        print '</td>';
+        print '<td align="right">';
+        print price($objp->total_ht);
+        print '</td>';
+        print '<td></td>';
+
+        print "</tr>\n";
+
+        $i ++;
+    }
+
+    print "</table>";
+
+    print "</div>";
 } else {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 

dolibarr/htdocs/core/actions_setmoduleoptions.inc.php

Indentation +21 added lines, -21 removed lines

@@ -29,29 +29,29 @@
 
 if ($action == 'update' && is_array($arrayofparameters))
 {
-	$db->begin();
+    $db->begin();
 
-	$ok=true;
-	foreach($arrayofparameters as $key => $val)
-	{
-		$result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
-		if ($result < 0)
-		{
-			$ok=false;
-			break;
-		}
-	}
+    $ok=true;
+    foreach($arrayofparameters as $key => $val)
+    {
+        $result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
+        if ($result < 0)
+        {
+            $ok=false;
+            break;
+        }
+    }
 
-	if (! $error)
-	{
-		$db->commit();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
-	{
-		$db->rollback();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-	}
+    if (! $error)
+    {
+        $db->commit();
+        if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+    else
+    {
+        $db->rollback();
+        if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+    }
 }
 
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)

dolibarr/htdocs/core/class/infobox.class.php

Indentation +35 added lines, -35 removed lines

@@ -27,15 +27,15 @@ 
  */
 class InfoBox
 {
-	/**
-	 * Name of positions 0=Home, 1=...
-	 *
-	 * @return	string[]		Array with list of zones
-	 */
-	static function getListOfPagesForBoxes()
-	{
-		return array(0=>'Home');
-	}
+    /**
+     * Name of positions 0=Home, 1=...
+     *
+     * @return	string[]		Array with list of zones
+     */
+    static function getListOfPagesForBoxes()
+    {
+        return array(0=>'Home');
+    }
 
     /**
      *  Return array of boxes qualified for area and user
@@ -68,10 +68,10 @@ 
             $sql.= " ORDER BY b.box_order";
         }
         else	// available
-		{
+        {
             $sql = "SELECT d.rowid as box_id, d.file, d.note, d.tms";
             $sql.= " FROM ".MAIN_DB_PREFIX."boxes_def as d";
-           	$sql.= " WHERE d.entity IN (0,".$conf->entity.")";
+                $sql.= " WHERE d.entity IN (0,".$conf->entity.")";
         }
 
         dol_syslog(get_class()."::listBoxes get default box list for mode=".$mode." userid=".(is_object($user)?$user->id:'')."", LOG_DEBUG);
@@ -97,17 +97,17 @@ 
                     {
                         $boxname=preg_replace('/\.php$/i','',$obj->file);
                         $relsourcefile = "/core/boxes/".$boxname.".php";
-					}
+                    }
 
-					//print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
+                    //print $obj->box_id.'-'.$boxname.'-'.$relsourcefile.'<br>';
 
-					// TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
+                    // TODO PERF Do not make "dol_include_once" here, nor "new" later. This means, we must store a 'depends' field to store modules list, then
                     // the "enabled" condition for modules forbidden for external users and the depends condition can be done.
                     // Goal is to avoid making a "new" done for each boxes returned by select.
                     dol_include_once($relsourcefile);
                     if (class_exists($boxname))
                     {
-                    	$box=new $boxname($db,$obj->note);		// Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
+                        $box=new $boxname($db,$obj->note);		// Constructor may set properties like box->enabled. obj->note is note into box def, not user params.
                         //$box=new stdClass();
 
                         // box properties
@@ -117,9 +117,9 @@ 
                         $box->box_order	= (empty($obj->box_order) ? '' : $obj->box_order);
                         $box->fk_user	= (empty($obj->fk_user) ? 0 : $obj->fk_user);
                         $box->sourcefile= $relsourcefile;
-                    	$box->class     = $boxname;
+                        $box->class     = $boxname;
 
-                    	if ($mode == 'activated' && ! is_object($user))	// List of activated box was not yet personalized into database
+                        if ($mode == 'activated' && ! is_object($user))	// List of activated box was not yet personalized into database
                         {
                             if (is_numeric($box->box_order))
                             {
@@ -138,19 +138,19 @@ 
                         {
                             foreach($box->depends as $moduleelem)
                             {
-                            	$arrayelem=explode('|',$moduleelem);
-                            	$tmpenabled=0;	// $tmpenabled is used for the '|' test (OR)
-                            	foreach($arrayelem as $module)
-                            	{
-    	                        	$tmpmodule=preg_replace('/@[^@]+/','',$module);
-    	                        	if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1;
-                            		//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
-                            	}
-                            	if (empty($tmpenabled))	// We found at least one module required that is disabled
-        	                    {
-        	                    	$enabled=0;
-        	                    	break;
-        	                    }
+                                $arrayelem=explode('|',$moduleelem);
+                                $tmpenabled=0;	// $tmpenabled is used for the '|' test (OR)
+                                foreach($arrayelem as $module)
+                                {
+                                    $tmpmodule=preg_replace('/@[^@]+/','',$module);
+                                    if (! empty($conf->$tmpmodule->enabled)) $tmpenabled=1;
+                                    //print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
+                                }
+                                if (empty($tmpenabled))	// We found at least one module required that is disabled
+                                {
+                                    $enabled=0;
+                                    break;
+                                }
                             }
                         }
                         //print '=>'.$boxname.'-enabled='.$enabled.'<br>';
@@ -160,16 +160,16 @@ 
                         else unset($box);
                     }
                     else
-					{
-                    	dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
-					}
+                    {
+                        dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
+                    }
                 }
                 $j++;
             }
         }
         else
-		{
-			dol_syslog($db->lasterror(),LOG_ERR);
+        {
+            dol_syslog($db->lasterror(),LOG_ERR);
             return array('error'=>$db->lasterror());
         }
 

dolibarr/htdocs/core/class/html.formintervention.class.php

Indentation +92 added lines, -92 removed lines

@@ -33,9 +33,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -50,99 +50,99 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show a combo list with contracts qualified for a third party
-	 *
-	 *	@param	int		$socid      Id third party (-1=all, 0=only interventions not linked to a third party, id=intervention not linked or linked to third party id)
-	 *	@param  int		$selected   Id intervention preselected
-	 *	@param  string	$htmlname   Nom de la zone html
-	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
-	 *	@return int         		Nbre of project if OK, <0 if KO
-	 */
-	function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
-	{
+    /**
+     *	Show a combo list with contracts qualified for a third party
+     *
+     *	@param	int		$socid      Id third party (-1=all, 0=only interventions not linked to a third party, id=intervention not linked or linked to third party id)
+     *	@param  int		$selected   Id intervention preselected
+     *	@param  string	$htmlname   Nom de la zone html
+     *	@param	int		$maxlength	Maximum length of label
+     *	@param	int		$showempty	Show empty line
+     *	@return int         		Nbre of project if OK, <0 if KO
+     */
+    function select_interventions($socid=-1, $selected='', $htmlname='interventionid', $maxlength=16, $showempty=1)
+    {
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+        global $db,$user,$conf,$langs;
 
-		$out='';
+        $out='';
 
-		$hideunselectables=false;
+        $hideunselectables=false;
 
-		// Search all contacts
-		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
-		$sql.= " WHERE f.entity = ".$conf->entity;
-		if ($socid != '')
-		{
-			if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql.= " AND f.fk_soc = ".$socid;
-		}
+        // Search all contacts
+        $sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
+        $sql.= ' FROM '.MAIN_DB_PREFIX .'fichinter as f';
+        $sql.= " WHERE f.entity = ".$conf->entity;
+        if ($socid != '')
+        {
+            if ($socid == '0') $sql.= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+            else $sql.= " AND f.fk_soc = ".$socid;
+        }
 
-		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out.='<option value="0">&nbsp;</option>';
-			$num = $db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
-					{
-						// Do nothing
-					}
-					else
-					{
-						$labeltoshow=dol_trunc($obj->ref,18);
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
-						{
-							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							$disabled=0;
-							if (! $obj->fk_statut > 0)
-							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
-							}
-							if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
-							}
+        dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $out.='<select id="interventionid" class="flat" name="'.$htmlname.'">';
+            if ($showempty) $out.='<option value="0">&nbsp;</option>';
+            $num = $db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+                    if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+                    {
+                        // Do nothing
+                    }
+                    else
+                    {
+                        $labeltoshow=dol_trunc($obj->ref,18);
+                        if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
+                        {
+                            $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            $disabled=0;
+                            if (! $obj->fk_statut > 0)
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' ('.$langs->trans("Draft").')';
+                            }
+                            if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+                            }
 
-							if ($hideunselectables && $disabled)
-							{
-								$resultat='';
-							}
-							else
-							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
-							}
-							$out.=$resultat;
-						}
-					}
-					$i++;
-				}
-			}
-			$out.='</select>';
-			$db->free($resql);
-			return $out;
-		}
-		else
-		{
-			dol_print_error($db);
-			return '';
-		}
-	}
+                            if ($hideunselectables && $disabled)
+                            {
+                                $resultat='';
+                            }
+                            else
+                            {
+                                $resultat='<option value="'.$obj->rowid.'"';
+                                if ($disabled) $resultat.=' disabled';
+                                $resultat.='>'.$labeltoshow;
+                                $resultat.='</option>';
+                            }
+                            $out.=$resultat;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            $out.='</select>';
+            $db->free($resql);
+            return $out;
+        }
+        else
+        {
+            dol_print_error($db);
+            return '';
+        }
+    }
 }

dolibarr/htdocs/core/class/interfaces.class.php

Indentation +35 added lines, -35 removed lines

@@ -36,12 +36,12 @@ 
      */
     public $db;
 
-	var $dir;				// Directory with all core and external triggers files
+    var $dir;				// Directory with all core and external triggers files
 
     /**
-	 * @var string[] Error codes (or messages)
-	 */
-	public $errors = array();
+     * @var string[] Error codes (or messages)
+     */
+    public $errors = array();
 
     /**
      *	Constructor
@@ -71,9 +71,9 @@ 
         // Check parameters
         if (! is_object($object) || ! is_object($conf))	// Error
         {
-        	$this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
+            $this->error='function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
             dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
-        	$this->errors[]=$this->error;
+            $this->errors[]=$this->error;
             return -1;
         }
         if (! is_object($langs))	// Warning
@@ -92,9 +92,9 @@ 
         $files = array();
         $modules = array();
         $orders = array();
-		$i=0;
+        $i=0;
 
-		$dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
+        $dirtriggers=array_merge(array('/core/triggers'),$conf->modules_parts['triggers']);
         foreach($dirtriggers as $reldir)
         {
             $dir=dol_buildpath($reldir,0);
@@ -111,9 +111,9 @@ 
                 {
                     if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i',$file,$reg))
                     {
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+                        $part1=$reg[1];
+                        $part2=$reg[2];
+                        $part3=$reg[3];
 
                         $nbfile++;
 
@@ -175,22 +175,22 @@ 
             $objMod = new $modName($this->db);
             if ($objMod)
             {
-            	$result=0;
-
-				if (method_exists($objMod, 'runTrigger'))	// New method to implement
-				{
-	                //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
-	                $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
-				}
-				elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
-				{
-	                dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
-					$result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
-				}
-				else
-				{
-	                dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
-				}
+                $result=0;
+
+                if (method_exists($objMod, 'runTrigger'))	// New method to implement
+                {
+                    //dol_syslog(get_class($this)."::run_triggers action=".$action." Launch runTrigger for file '".$files[$key]."'", LOG_DEBUG);
+                    $result=$objMod->runTrigger($action,$object,$user,$langs,$conf);
+                }
+                elseif (method_exists($objMod, 'run_trigger'))	// Deprecated method
+                {
+                    dol_syslog(get_class($this)."::run_triggers action=".$action." Launch old method run_trigger (rename your trigger into runTrigger) for file '".$files[$key]."'", LOG_WARNING);
+                    $result=$objMod->run_trigger($action,$object,$user,$langs,$conf);
+                }
+                else
+                {
+                    dol_syslog(get_class($this)."::run_triggers action=".$action." A trigger was declared for class ".get_class($objMod)." but method runTrigger was not found", LOG_ERR);
+                }
 
                 if ($result > 0)
                 {
@@ -215,7 +215,7 @@ 
                 }
             }
             else
-			{
+            {
                 dol_syslog(get_class($this)."::run_triggers action=".$action." Failed to instantiate trigger for file '".$files[$key]."'", LOG_ERR);
             }
         }
@@ -254,7 +254,7 @@ 
         $dirtriggers=array_merge(array('/core/triggers/'),$conf->modules_parts['triggers']);
         if (is_array($forcedirtriggers))
         {
-        	$dirtriggers=$forcedirtriggers;
+            $dirtriggers=$forcedirtriggers;
         }
 
         foreach($dirtriggers as $reldir)
@@ -274,9 +274,9 @@ 
                     {
                         if (preg_match('/\.back$/',$file)) continue;
 
-						$part1=$reg[1];
-						$part2=$reg[2];
-						$part3=$reg[3];
+                        $part1=$reg[1];
+                        $part2=$reg[2];
+                        $part3=$reg[3];
 
                         $modName = 'Interface'.ucfirst($reg[3]);
                         //print "file=$file"; print "modName=$modName"; exit;
@@ -317,8 +317,8 @@ 
 
             if (! class_exists($modName))
             {
-				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
-            	continue;
+                print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
+                continue;
             }
 
             $objMod = new $modName($db);
@@ -340,7 +340,7 @@ 
                 $triggers[$j]['module']=strtolower($module);
             }
 
-			// We set info of modules
+            // We set info of modules
             $triggers[$j]['picto'] = $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
             $triggers[$j]['file'] = $files[$key];
             $triggers[$j]['fullpath'] = $fullpath[$key];

dolibarr/htdocs/core/class/google.class.php

Indentation +45 added lines, -45 removed lines

@@ -26,63 +26,63 @@
  */
 class GoogleAPI
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	public $key;
+    public $key;
 
-	/**
-	 * Constructor
-	 *
-	 * @param 	DoliDB		$db			Database handler
-	 * @param	string		$key		Google key
-	 */
-	function __construct($db,$key)
-	{
-		$this->db=$db;
-		$this->key=$key;
-	}
+    /**
+     * Constructor
+     *
+     * @param 	DoliDB		$db			Database handler
+     * @param	string		$key		Google key
+     */
+    function __construct($db,$key)
+    {
+        $this->db=$db;
+        $this->key=$key;
+    }
 
 
-	/**
-	 *  Return geo coordinates of an address
-	 *
-	 *  @param	string	$address	Address
-	 * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
-	 *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
-	 *	@return	string				Coordinates
-	 */
-	function getGeoCoordinatesOfAddress($address)
-	{
-		global $conf;
+    /**
+     *  Return geo coordinates of an address
+     *
+     *  @param	string	$address	Address
+     * 								Example: 68 Grande rue Charles de Gaulle,+94130,+Nogent sur Marne,+France
+     *								Example: 188, rue de Fontenay,+94300,+Vincennes,+France
+     *	@return	string				Coordinates
+     */
+    function getGeoCoordinatesOfAddress($address)
+    {
+        global $conf;
 
-		$i=0;
+        $i=0;
 
-		// Desired address
-		$urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
+        // Desired address
+        $urladdress = "https://maps.google.com/maps/geo?q=".urlencode($address)."&output=xml&key=".$this->key;
 
-		// Retrieve the URL contents
-		$page = file_get_contents($urladdress);
+        // Retrieve the URL contents
+        $page = file_get_contents($urladdress);
 
-		$code = strstr($page, '<coordinates>');
-		$code = strstr($code, '>');
-		$val=strpos($code, "<");
-		$code = substr($code, 1, $val-1);
-		//print $code;
-		//print "<br>";
-		$latitude = substr($code, 0, strpos($code, ","));
-		$longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
+        $code = strstr($page, '<coordinates>');
+        $code = strstr($code, '>');
+        $val=strpos($code, "<");
+        $code = substr($code, 1, $val-1);
+        //print $code;
+        //print "<br>";
+        $latitude = substr($code, 0, strpos($code, ","));
+        $longitude = substr($code, strpos($code, ",")+1, dol_strlen(strpos($code, ","))-3);
 
-		// Output the coordinates
-		//echo "Longitude: $longitude ',' Latitude: $latitude";
+        // Output the coordinates
+        //echo "Longitude: $longitude ',' Latitude: $latitude";
 
-		$i++;
-	}
+        $i++;
+    }
 }

dolibarr/htdocs/core/class/commoninvoice.class.php

Indentation +698 added lines, -698 removed lines

@@ -61,624 +61,624 @@ 
      */
     const TYPE_SITUATION = 5;
 
-	/**
-	 * Draft status
-	 */
-	const STATUS_DRAFT = 0;
-
-	/**
-	 * Validated (need to be paid)
-	 */
-	const STATUS_VALIDATED = 1;
-
-	/**
-	 * Classified paid.
-	 * If paid partially, $this->close_code can be:
-	 * - CLOSECODE_DISCOUNTVAT
-	 * - CLOSECODE_BADDEBT
-	 * If paid completelly, this->close_code will be null
-	 */
-	const STATUS_CLOSED = 2;
-
-	/**
-	 * Classified abandoned and no payment done.
-	 * $this->close_code can be:
-	 * - CLOSECODE_BADDEBT
-	 * - CLOSECODE_ABANDONED
-	 * - CLOSECODE_REPLACED
-	 */
-	const STATUS_ABANDONED = 3;
-
-
-	/**
-	 * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
-	 *  This does not include open direct debit requests.
-	 *
-	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		double						Remain of amount to pay
-	 */
-	function getRemainToPay($multicurrency=0)
-	{
-	    $alreadypaid=0;
-	    $alreadypaid+=$this->getSommePaiement($multicurrency);
-	    $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
-	    $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
-    	return $this->total_ttc - $alreadypaid;
-	}
-
-	/**
-	 * 	Return amount of payments already done
-	 *
-	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		int						Amount of payment already done, <0 if KO
-	 */
-	function getSommePaiement($multicurrency=0)
-	{
-		$table='paiement_facture';
-		$field='fk_facture';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
-			$table='paiementfourn_facturefourn';
-			$field='fk_facturefourn';
-		}
-
-		$sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
-		$sql.= ' WHERE '.$field.' = '.$this->id;
-
-		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			$this->db->free($resql);
-			if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *    	Return amount (with tax) of all deposits invoices used by invoice.
+    /**
+     * Draft status
+     */
+    const STATUS_DRAFT = 0;
+
+    /**
+     * Validated (need to be paid)
+     */
+    const STATUS_VALIDATED = 1;
+
+    /**
+     * Classified paid.
+     * If paid partially, $this->close_code can be:
+     * - CLOSECODE_DISCOUNTVAT
+     * - CLOSECODE_BADDEBT
+     * If paid completelly, this->close_code will be null
+     */
+    const STATUS_CLOSED = 2;
+
+    /**
+     * Classified abandoned and no payment done.
+     * $this->close_code can be:
+     * - CLOSECODE_BADDEBT
+     * - CLOSECODE_ABANDONED
+     * - CLOSECODE_REPLACED
+     */
+    const STATUS_ABANDONED = 3;
+
+
+    /**
+     * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
+     *  This does not include open direct debit requests.
+     *
+     *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *	@return		double						Remain of amount to pay
+     */
+    function getRemainToPay($multicurrency=0)
+    {
+        $alreadypaid=0;
+        $alreadypaid+=$this->getSommePaiement($multicurrency);
+        $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
+        $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
+        return $this->total_ttc - $alreadypaid;
+    }
+
+    /**
+     * 	Return amount of payments already done
+     *
+     *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *	@return		int						Amount of payment already done, <0 if KO
+     */
+    function getSommePaiement($multicurrency=0)
+    {
+        $table='paiement_facture';
+        $field='fk_facture';
+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+        {
+            $table='paiementfourn_facturefourn';
+            $field='fk_facturefourn';
+        }
+
+        $sql = 'SELECT sum(amount) as amount, sum(multicurrency_amount) as multicurrency_amount';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$table;
+        $sql.= ' WHERE '.$field.' = '.$this->id;
+
+        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            $this->db->free($resql);
+            if ($multicurrency) return $obj->multicurrency_amount;
+            else return $obj->amount;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            return -1;
+        }
+    }
+
+    /**
+     *    	Return amount (with tax) of all deposits invoices used by invoice.
      *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
-	 *
-	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of deposits amount otherwise
-	 */
-	function getSumDepositsUsed($multicurrency=0)
-	{
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-	    {
-	        // TODO
-	       return 0;
-	    }
-
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    }
-	    else
-	    {
-	        $this->error=$discountstatic->error;
-	        return -1;
-	    }
-	}
-
-	/**
-	 *    	Return amount (with tax) of all credit notes invoices + excess received used by invoice
-	 *
-	 * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
-	 */
-	function getSumCreditNotesUsed($multicurrency=0)
-	{
-	    require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
-
-	    $discountstatic=new DiscountAbsolute($this->db);
-	    $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
-	    if ($result >= 0)
-	    {
-	        return $result;
-	    }
-	    else
-	    {
-	        $this->error=$discountstatic->error;
-	        return -1;
-	    }
-	}
-
-	/**
-	 *	Renvoie tableau des ids de facture avoir issus de la facture
-	 *
-	 *	@return		array		Tableau d'id de factures avoirs
-	 */
-	function getListIdAvoirFromInvoice()
-	{
-		$idarray=array();
-
-		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type = 2';
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i = 0;
-			while ($i < $num)
-			{
-				$row = $this->db->fetch_row($resql);
-				$idarray[]=$row[0];
-				$i++;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-		return $idarray;
-	}
-
-	/**
-	 *	Renvoie l'id de la facture qui la remplace
-	 *
-	 *	@param		string	$option		filtre sur statut ('', 'validated', ...)
-	 *	@return		int					<0 si KO, 0 si aucune facture ne remplace, id facture sinon
-	 */
-	function getIdReplacingInvoice($option='')
-	{
-		$sql = 'SELECT rowid';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
-		$sql.= ' WHERE fk_facture_source = '.$this->id;
-		$sql.= ' AND type < 2';
-		if ($option == 'validated') $sql.= ' AND fk_statut = 1';
-		// PROTECTION BAD DATA
-		// Au cas ou base corrompue et qu'il y a une facture de remplacement validee
-		// et une autre non, on donne priorite a la validee.
-		// Ne devrait pas arriver (sauf si acces concurrentiel et que 2 personnes
-		// ont cree en meme temps une facture de remplacement pour la meme facture)
-		$sql.= ' ORDER BY fk_statut DESC';
-
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
-				// Si il y en a
-				return $obj->rowid;
-			}
-			else
-			{
-				// Si aucune facture ne remplace
-				return 0;
-			}
-		}
-		else
-		{
-			return -1;
-		}
-	}
-
-	/**
-	 *  Return list of payments
-	 *
-	 *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
-	 *  @return     array					Array with list of payments
-	 */
-	function getListOfPayments($filtertype='')
-	{
-		$retarray=array();
-
-		$table='paiement_facture';
-		$table2='paiement';
-		$field='fk_facture';
-		$field2='fk_paiement';
-		$sharedentity='facture';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
-			$table='paiementfourn_facturefourn';
-			$table2='paiementfourn';
-			$field='fk_facturefourn';
-			$field2='fk_paiementfourn';
-			$sharedentity='facture_fourn';
-		}
-
-		$sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
-		$sql.= ' WHERE pf.'.$field.' = '.$this->id;
-		//$sql.= ' WHERE pf.'.$field.' = 1';
-		$sql.= ' AND pf.'.$field2.' = p.rowid';
-		$sql.= ' AND p.fk_paiement = t.id';
-		$sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
-		if ($filtertype) $sql.=" AND t.code='PRE'";
-
-		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num = $this->db->num_rows($resql);
-			$i=0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($resql);
-				$retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
-				$i++;
-			}
-			$this->db->free($resql);
-			return $retarray;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			dol_print_error($this->db);
-			return array();
-		}
-	}
+     *
+     * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *		@return		int						<0 if KO, Sum of deposits amount otherwise
+     */
+    function getSumDepositsUsed($multicurrency=0)
+    {
+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+        {
+            // TODO
+            return 0;
+        }
+
+        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+        $discountstatic=new DiscountAbsolute($this->db);
+        $result=$discountstatic->getSumDepositsUsed($this, $multicurrency);
+        if ($result >= 0)
+        {
+            return $result;
+        }
+        else
+        {
+            $this->error=$discountstatic->error;
+            return -1;
+        }
+    }
+
+    /**
+     *    	Return amount (with tax) of all credit notes invoices + excess received used by invoice
+     *
+     * 		@param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
+     *		@return		int						<0 if KO, Sum of credit notes and deposits amount otherwise
+     */
+    function getSumCreditNotesUsed($multicurrency=0)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
+        $discountstatic=new DiscountAbsolute($this->db);
+        $result=$discountstatic->getSumCreditNotesUsed($this, $multicurrency);
+        if ($result >= 0)
+        {
+            return $result;
+        }
+        else
+        {
+            $this->error=$discountstatic->error;
+            return -1;
+        }
+    }
+
+    /**
+     *	Renvoie tableau des ids de facture avoir issus de la facture
+     *
+     *	@return		array		Tableau d'id de factures avoirs
+     */
+    function getListIdAvoirFromInvoice()
+    {
+        $idarray=array();
+
+        $sql = 'SELECT rowid';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE fk_facture_source = '.$this->id;
+        $sql.= ' AND type = 2';
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $row = $this->db->fetch_row($resql);
+                $idarray[]=$row[0];
+                $i++;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+        return $idarray;
+    }
+
+    /**
+     *	Renvoie l'id de la facture qui la remplace
+     *
+     *	@param		string	$option		filtre sur statut ('', 'validated', ...)
+     *	@return		int					<0 si KO, 0 si aucune facture ne remplace, id facture sinon
+     */
+    function getIdReplacingInvoice($option='')
+    {
+        $sql = 'SELECT rowid';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
+        $sql.= ' WHERE fk_facture_source = '.$this->id;
+        $sql.= ' AND type < 2';
+        if ($option == 'validated') $sql.= ' AND fk_statut = 1';
+        // PROTECTION BAD DATA
+        // Au cas ou base corrompue et qu'il y a une facture de remplacement validee
+        // et une autre non, on donne priorite a la validee.
+        // Ne devrait pas arriver (sauf si acces concurrentiel et que 2 personnes
+        // ont cree en meme temps une facture de remplacement pour la meme facture)
+        $sql.= ' ORDER BY fk_statut DESC';
+
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj)
+            {
+                // Si il y en a
+                return $obj->rowid;
+            }
+            else
+            {
+                // Si aucune facture ne remplace
+                return 0;
+            }
+        }
+        else
+        {
+            return -1;
+        }
+    }
+
+    /**
+     *  Return list of payments
+     *
+     *	@param		string	$filtertype		1 to filter on type of payment == 'PRE'
+     *  @return     array					Array with list of payments
+     */
+    function getListOfPayments($filtertype='')
+    {
+        $retarray=array();
+
+        $table='paiement_facture';
+        $table2='paiement';
+        $field='fk_facture';
+        $field2='fk_paiement';
+        $sharedentity='facture';
+        if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
+        {
+            $table='paiementfourn_facturefourn';
+            $table2='paiementfourn';
+            $field='fk_facturefourn';
+            $field2='fk_paiementfourn';
+            $sharedentity='facture_fourn';
+        }
+
+        $sql = 'SELECT p.ref, pf.amount, pf.multicurrency_amount, p.fk_paiement, p.datep, p.num_paiement as num, t.code';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$table.' as pf, '.MAIN_DB_PREFIX.$table2.' as p, '.MAIN_DB_PREFIX.'c_paiement as t';
+        $sql.= ' WHERE pf.'.$field.' = '.$this->id;
+        //$sql.= ' WHERE pf.'.$field.' = 1';
+        $sql.= ' AND pf.'.$field2.' = p.rowid';
+        $sql.= ' AND p.fk_paiement = t.id';
+        $sql.= ' AND p.entity IN (' . getEntity($sharedentity).')';
+        if ($filtertype) $sql.=" AND t.code='PRE'";
+
+        dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i=0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+                $retarray[]=array('amount'=>$obj->amount,'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
+                $i++;
+            }
+            $this->db->free($resql);
+            return $retarray;
+        }
+        else
+        {
+            $this->error=$this->db->lasterror();
+            dol_print_error($this->db);
+            return array();
+        }
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return if an invoice can be deleted
-	 *	Rule is:
-	 *  If invoice is draft and has a temporary ref -> yes (1)
-	 *  If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on -> no (0)
-	 *  If invoice is dispatched in bookkeeping -> no (-1)
-	 *  If invoice has a definitive ref, is not last and INVOICE_CAN_ALWAYS_BE_REMOVED off -> no (-2)
-	 *  If invoice not last in a cycle -> no (-3)
-	 *  If there is payment -> no (-4)
-	 *  Otherwise -> yes (2)
-	 *
-	 *  @return    int         <=0 if no, >0 if yes
-	 */
-	function is_erasable()
-	{
+    /**
+     *  Return if an invoice can be deleted
+     *	Rule is:
+     *  If invoice is draft and has a temporary ref -> yes (1)
+     *  If hidden option INVOICE_CAN_NEVER_BE_REMOVED is on -> no (0)
+     *  If invoice is dispatched in bookkeeping -> no (-1)
+     *  If invoice has a definitive ref, is not last and INVOICE_CAN_ALWAYS_BE_REMOVED off -> no (-2)
+     *  If invoice not last in a cycle -> no (-3)
+     *  If there is payment -> no (-4)
+     *  Otherwise -> yes (2)
+     *
+     *  @return    int         <=0 if no, >0 if yes
+     */
+    function is_erasable()
+    {
         // phpcs:enable
-		global $conf;
-
-		// We check if invoice is a temporary number (PROVxxxx)
-		$tmppart = substr($this->ref, 1, 4);
-
-		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
-		{
-			return 1;
-		}
-
-		if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
-
-		// If not a draft invoice and not temporary invoice
-		if ($tmppart !== 'PROV')
-		{
-			$ventilExportCompta = $this->getVentilExportCompta();
-			if ($ventilExportCompta != 0) return -1;
-
-			// Get last number of validated invoice
-			if ($this->element != 'invoice_supplier')
-			{
-				if (empty($this->thirdparty)) $this->fetch_thirdparty();	// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
-				$maxref = $this->getNextNumRef($this->thirdparty,'last');
-
-				// If there is no invoice into the reset range and not already dispatched, we can delete
-				// If invoice to delete is last one and not already dispatched, we can delete
-				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) return -2;
-
-				// TODO If there is payment in bookkeeping, check payment is not dispatched in accounting
-				// ...
-
-				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
-				{
-					$last = $this->is_last_in_cycle();
-					if (! $last) return -3;
-				}
-			}
-		}
-
-		// Test if there is at least one payment. If yes, refuse to delete.
-		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) return -4;
-
-		return 2;
-	}
-
-	/**
-	 *	Return if an invoice was dispatched into bookkeeping
-	 *
-	 *	@return     int         <0 if KO, 0=no, 1=yes
-	 */
-	public function getVentilExportCompta()
-	{
-		$alreadydispatched = 0;
-
-		$type = 'customer_invoice';
-		if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';
-
-		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
-		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
-				$alreadydispatched = $obj->nb;
-			}
-		}
-		else
-		{
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-
-		if ($alreadydispatched)
-		{
-			return 1;
-		}
-		return 0;
-	}
-
-
-	/**
-	 *	Return label of type of invoice
-	 *
-	 *	@return     string        Label of type of invoice
-	 */
-	function getLibType()
-	{
-		global $langs;
+        global $conf;
+
+        // We check if invoice is a temporary number (PROVxxxx)
+        $tmppart = substr($this->ref, 1, 4);
+
+        if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
+        {
+            return 1;
+        }
+
+        if (! empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
+
+        // If not a draft invoice and not temporary invoice
+        if ($tmppart !== 'PROV')
+        {
+            $ventilExportCompta = $this->getVentilExportCompta();
+            if ($ventilExportCompta != 0) return -1;
+
+            // Get last number of validated invoice
+            if ($this->element != 'invoice_supplier')
+            {
+                if (empty($this->thirdparty)) $this->fetch_thirdparty();	// We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+                $maxref = $this->getNextNumRef($this->thirdparty,'last');
+
+                // If there is no invoice into the reset range and not already dispatched, we can delete
+                // If invoice to delete is last one and not already dispatched, we can delete
+                if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) return -2;
+
+                // TODO If there is payment in bookkeeping, check payment is not dispatched in accounting
+                // ...
+
+                if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
+                {
+                    $last = $this->is_last_in_cycle();
+                    if (! $last) return -3;
+                }
+            }
+        }
+
+        // Test if there is at least one payment. If yes, refuse to delete.
+        if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) return -4;
+
+        return 2;
+    }
+
+    /**
+     *	Return if an invoice was dispatched into bookkeeping
+     *
+     *	@return     int         <0 if KO, 0=no, 1=yes
+     */
+    public function getVentilExportCompta()
+    {
+        $alreadydispatched = 0;
+
+        $type = 'customer_invoice';
+        if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';
+
+        $sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$type."' AND ab.fk_doc = ".$this->id;
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $obj = $this->db->fetch_object($resql);
+            if ($obj)
+            {
+                $alreadydispatched = $obj->nb;
+            }
+        }
+        else
+        {
+            $this->error = $this->db->lasterror();
+            return -1;
+        }
+
+        if ($alreadydispatched)
+        {
+            return 1;
+        }
+        return 0;
+    }
+
+
+    /**
+     *	Return label of type of invoice
+     *
+     *	@return     string        Label of type of invoice
+     */
+    function getLibType()
+    {
+        global $langs;
         if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
         elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
         elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
         elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
         elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma");           // Not used.
         elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
-		return $langs->trans("Unknown");
-	}
-
-	/**
-	 *  Return label of object status
-	 *
-	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-	 *  @return     string			        Label of status
-	 */
-	function getLibStatut($mode=0, $alreadypaid=-1)
-	{
-		return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
-	}
+        return $langs->trans("Unknown");
+    }
+
+    /**
+     *  Return label of object status
+     *
+     *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+     *  @param      integer	$alreadypaid    0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+     *  @return     string			        Label of status
+     */
+    function getLibStatut($mode=0, $alreadypaid=-1)
+    {
+        return $this->LibStatut($this->paye, $this->statut, $mode, $alreadypaid, $this->type);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return label of a status
-	 *
-	 *	@param    	int  	$paye          	Status field paye
-	 *	@param      int		$status        	Id status
-	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
-	 *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
-	 *	@param		int		$type			Type invoice
-	 *	@return     string        			Label of status
-	 */
-	function LibStatut($paye, $status, $mode=0, $alreadypaid=-1, $type=0)
-	{
+    /**
+     *	Return label of a status
+     *
+     *	@param    	int  	$paye          	Status field paye
+     *	@param      int		$status        	Id status
+     *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
+     *	@param		integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, -1 otherwise)
+     *	@param		int		$type			Type invoice
+     *	@return     string        			Label of status
+     */
+    function LibStatut($paye, $status, $mode=0, $alreadypaid=-1, $type=0)
+    {
         // phpcs:enable
-		global $langs;
-		$langs->load('bills');
-
-		//print "$paye,$status,$mode,$alreadypaid,$type";
-		if ($mode == 0)
-		{
-			$prefix='';
-			if (! $paye)
-			{
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 1)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return $langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');
-				else return $langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 2)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
-			}
-		}
-		elseif ($mode == 3)
-		{
-			$prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6');
-			}
-		}
-		elseif ($mode == 4)
-		{
-			$prefix='';
-			if (! $paye)
-			{
-				if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
-				elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
-				else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
-				elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
-				else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
-			}
-		}
-		elseif ($mode == 5 || $mode == 6)
-		{
-			$prefix='';
-			if ($mode == 5) $prefix='Short';
-			if (! $paye)
-			{
-				if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
-				elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
-				elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
-				elseif ($alreadypaid <= 0)
-				{
-				    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
-				    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
-				}
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
-			}
-			else
-			{
-				if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
-				elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
-				else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
-			}
-		}
-	}
+        global $langs;
+        $langs->load('bills');
+
+        //print "$paye,$status,$mode,$alreadypaid,$type";
+        if ($mode == 0)
+        {
+            $prefix='';
+            if (! $paye)
+            {
+                if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusClosedUnpaid');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+                else return $langs->trans('Bill'.$prefix.'StatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');       // credit note
+                elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');             // deposit invoice
+                else return $langs->trans('Bill'.$prefix.'StatusPaid');
+            }
+        }
+        elseif ($mode == 1)
+        {
+            $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return $langs->trans('Bill'.$prefix.'StatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusCanceled');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return $langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return $langs->trans('Bill'.$prefix.'StatusNotPaid');
+                else return $langs->trans('Bill'.$prefix.'StatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+                elseif ($type == self::TYPE_DEPOSIT) return $langs->trans('Bill'.$prefix.'StatusConverted');
+                else return $langs->trans('Bill'.$prefix.'StatusPaid');
+            }
+        }
+        elseif ($mode == 2)
+        {
+            $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('Bill'.$prefix.'StatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('StatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('Bill'.$prefix.'StatusNotPaid');
+                else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('Bill'.$prefix.'StatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted');
+                elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusConverted');
+                else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('Bill'.$prefix.'StatusPaid');
+            }
+        }
+        elseif ($mode == 3)
+        {
+            $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+                elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+                else return img_picto($langs->trans('BillStatusStarted'),'statut3');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+                elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6');
+                else return img_picto($langs->trans('BillStatusPaid'),'statut6');
+            }
+        }
+        elseif ($mode == 4)
+        {
+            $prefix='';
+            if (! $paye)
+            {
+                if ($status == 0) return img_picto($langs->trans('BillStatusDraft'),'statut0').' '.$langs->trans('BillStatusDraft');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return img_picto($langs->trans('BillStatusCanceled'),'statut5').' '.$langs->trans('Bill'.$prefix.'StatusCanceled');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9').' '.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially');
+                elseif ($alreadypaid <= 0) return img_picto($langs->trans('BillStatusNotPaid'),'statut1').' '.$langs->trans('BillStatusNotPaid');
+                else return img_picto($langs->trans('BillStatusStarted'),'statut3').' '.$langs->trans('BillStatusStarted');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6').' '.$langs->trans('BillStatusPaidBackOrConverted');
+                elseif ($type == self::TYPE_DEPOSIT) return img_picto($langs->trans('BillStatusConverted'),'statut6').' '.$langs->trans('BillStatusConverted');
+                else return img_picto($langs->trans('BillStatusPaid'),'statut6').' '.$langs->trans('BillStatusPaid');
+            }
+        }
+        elseif ($mode == 5 || $mode == 6)
+        {
+            $prefix='';
+            if ($mode == 5) $prefix='Short';
+            if (! $paye)
+            {
+                if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
+                elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
+                elseif (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut9');
+                elseif ($alreadypaid <= 0)
+                {
+                    if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
+                    return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
+                }
+                else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
+            }
+            else
+            {
+                if ($type == self::TYPE_CREDIT_NOTE) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted').' </span>'.img_picto($langs->trans('BillStatusPaidBackOrConverted'),'statut6');
+                elseif ($type == self::TYPE_DEPOSIT) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusConverted').' </span>'.img_picto($langs->trans('BillStatusConverted'),'statut6');
+                else return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusPaid').' </span>'.img_picto($langs->trans('BillStatusPaid'),'statut6');
+            }
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Renvoi une date limite de reglement de facture en fonction des
-	 *	conditions de reglements de la facture et date de facturation.
-	 *
-	 *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
-	 *  @return     date     			       	Date limite de reglement si ok, <0 si ko
-	 */
-	function calculate_date_lim_reglement($cond_reglement=0)
-	{
+    /**
+     *	Renvoi une date limite de reglement de facture en fonction des
+     *	conditions de reglements de la facture et date de facturation.
+     *
+     *	@param      integer	$cond_reglement   	Condition of payment (code or id) to use. If 0, we use current condition.
+     *  @return     date     			       	Date limite de reglement si ok, <0 si ko
+     */
+    function calculate_date_lim_reglement($cond_reglement=0)
+    {
         // phpcs:enable
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
-		if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
+        if (! $cond_reglement) $cond_reglement=$this->cond_reglement_code;
+        if (! $cond_reglement) $cond_reglement=$this->cond_reglement_id;
 
-		$cdr_nbjour=0;
+        $cdr_nbjour=0;
         $cdr_type=0;
         $cdr_decalage=0;
 
-		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
-		$sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
-		else {
-			$sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
-			$sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
-		}
-
-		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
-		$resqltemp=$this->db->query($sqltemp);
-		if ($resqltemp)
-		{
-			if ($this->db->num_rows($resqltemp))
-			{
-				$obj = $this->db->fetch_object($resqltemp);
-				$cdr_nbjour = $obj->nbjour;
-				$cdr_type = $obj->type_cdr;
-				$cdr_decalage = $obj->decalage;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error();
-			return -1;
-		}
-		$this->db->free($resqltemp);
-
-		/* Definition de la date limite */
-
-		// 0 : ajout du nombre de jours
-		if ($cdr_type == 0)
-		{
-			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
-
-			$datelim += ($cdr_decalage * 3600 * 24);
-		}
-		// 1 : application de la regle "fin de mois"
-		elseif ($cdr_type == 1)
-		{
-			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
-
-			$mois=date('m', $datelim);
-			$annee=date('Y', $datelim);
-			if ($mois == 12)
-			{
-				$mois = 1;
-				$annee += 1;
-			}
-			else
-			{
-				$mois += 1;
-			}
-			// On se deplace au debut du mois suivant, et on retire un jour
-			$datelim=dol_mktime(12,0,0,$mois,1,$annee);
-			$datelim -= (3600 * 24);
-
-			$datelim += ($cdr_decalage * 3600 * 24);
-		}
-		// 2 : application de la règle, le N du mois courant ou suivant
-		elseif ($cdr_type == 2 && !empty($cdr_decalage))
-		{
-			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
-
-			$date_piece = dol_mktime(0, 0, 0, date('m', $datelim),date('d', $datelim),date('Y', $datelim)); // Sans les heures minutes et secondes
-			$date_lim_current = dol_mktime(0, 0, 0, date('m', $datelim), $cdr_decalage, date('Y', $datelim)); // Sans les heures minutes et secondes
-			$date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm');	// Add 1 month
-
-			$diff = $date_piece - $date_lim_current;
-
-			if ($diff < 0) $datelim = $date_lim_current;
-			else $datelim = $date_lim_next;
-		}
-		else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
-
-		return $datelim;
-	}
+        $sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
+        $sqltemp.= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
+        if (is_numeric($cond_reglement)) $sqltemp.= " WHERE c.rowid=".$cond_reglement;
+        else {
+            $sqltemp.= " WHERE c.entity IN (".getEntity('c_payment_term').")";
+            $sqltemp.= " AND c.code='".$this->db->escape($cond_reglement)."'";
+        }
+
+        dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
+        $resqltemp=$this->db->query($sqltemp);
+        if ($resqltemp)
+        {
+            if ($this->db->num_rows($resqltemp))
+            {
+                $obj = $this->db->fetch_object($resqltemp);
+                $cdr_nbjour = $obj->nbjour;
+                $cdr_type = $obj->type_cdr;
+                $cdr_decalage = $obj->decalage;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error();
+            return -1;
+        }
+        $this->db->free($resqltemp);
+
+        /* Definition de la date limite */
+
+        // 0 : ajout du nombre de jours
+        if ($cdr_type == 0)
+        {
+            $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
+
+            $datelim += ($cdr_decalage * 3600 * 24);
+        }
+        // 1 : application de la regle "fin de mois"
+        elseif ($cdr_type == 1)
+        {
+            $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
+
+            $mois=date('m', $datelim);
+            $annee=date('Y', $datelim);
+            if ($mois == 12)
+            {
+                $mois = 1;
+                $annee += 1;
+            }
+            else
+            {
+                $mois += 1;
+            }
+            // On se deplace au debut du mois suivant, et on retire un jour
+            $datelim=dol_mktime(12,0,0,$mois,1,$annee);
+            $datelim -= (3600 * 24);
+
+            $datelim += ($cdr_decalage * 3600 * 24);
+        }
+        // 2 : application de la règle, le N du mois courant ou suivant
+        elseif ($cdr_type == 2 && !empty($cdr_decalage))
+        {
+            $datelim = $this->date + ($cdr_nbjour * 3600 * 24);
+
+            $date_piece = dol_mktime(0, 0, 0, date('m', $datelim),date('d', $datelim),date('Y', $datelim)); // Sans les heures minutes et secondes
+            $date_lim_current = dol_mktime(0, 0, 0, date('m', $datelim), $cdr_decalage, date('Y', $datelim)); // Sans les heures minutes et secondes
+            $date_lim_next = dol_time_plus_duree($date_lim_current, 1, 'm');	// Add 1 month
+
+            $diff = $date_piece - $date_lim_current;
+
+            if ($diff < 0) $datelim = $date_lim_current;
+            else $datelim = $date_lim_next;
+        }
+        else return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
+
+        return $datelim;
+    }
 }
 
 
@@ -690,105 +690,105 @@ 
  */
 abstract class CommonInvoiceLine extends CommonObjectLine
 {
-	/**
-	 * Quantity
-	 * @var double
-	 */
-	public $qty;
-
-	/**
-	 * Unit price before taxes
-	 * @var float
-	 */
-	public $subprice;
-
-	/**
-	 * Type of the product. 0 for product 1 for service
-	 * @var int
-	 */
-	public $product_type = 0;
-
-	/**
-	 * Id of corresponding product
-	 * @var int
-	 */
-	public $fk_product;
-
-	/**
-	 * VAT code
-	 * @var string
-	 */
-	public $vat_src_code;
-
-	/**
-	 * VAT %
-	 * @var float
-	 */
-	public $tva_tx;
-
-	/**
-	 * Local tax 1 %
-	 * @var float
-	 */
-	public $localtax1_tx;
-
-	/**
-	 * Local tax 2 %
-	 * @var float
-	 */
-	public $localtax2_tx;
-
-	/**
-	 * Percent of discount
-	 * @var float
-	 */
-	public $remise_percent;
-
-	/**
-	 * Total amount before taxes
-	 * @var float
-	 */
-	public $total_ht;
-
-	/**
-	 * Total VAT amount
-	 * @var float
-	 */
-	public $total_tva;
-
-	/**
-	 * Total local tax 1 amount
-	 * @var float
-	 */
-	public $total_localtax1;
-
-	/**
-	 * Total local tax 2 amount
-	 * @var float
-	 */
-	public $total_localtax2;
-
-	/**
-	 * Total amount with taxes
-	 * @var float
-	 */
-	public $total_ttc;
-
-	/**
-	 * Liste d'options cumulables:
-	 * Bit 0:	0 si TVA normal - 1 si TVA NPR
-	 * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
-	 * @var int
-	 */
-	public $info_bits = 0;
-
-	/**
-	 *  Constructor
-	 *
-	 *  @param	DoliDB		$db		Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
+    /**
+     * Quantity
+     * @var double
+     */
+    public $qty;
+
+    /**
+     * Unit price before taxes
+     * @var float
+     */
+    public $subprice;
+
+    /**
+     * Type of the product. 0 for product 1 for service
+     * @var int
+     */
+    public $product_type = 0;
+
+    /**
+     * Id of corresponding product
+     * @var int
+     */
+    public $fk_product;
+
+    /**
+     * VAT code
+     * @var string
+     */
+    public $vat_src_code;
+
+    /**
+     * VAT %
+     * @var float
+     */
+    public $tva_tx;
+
+    /**
+     * Local tax 1 %
+     * @var float
+     */
+    public $localtax1_tx;
+
+    /**
+     * Local tax 2 %
+     * @var float
+     */
+    public $localtax2_tx;
+
+    /**
+     * Percent of discount
+     * @var float
+     */
+    public $remise_percent;
+
+    /**
+     * Total amount before taxes
+     * @var float
+     */
+    public $total_ht;
+
+    /**
+     * Total VAT amount
+     * @var float
+     */
+    public $total_tva;
+
+    /**
+     * Total local tax 1 amount
+     * @var float
+     */
+    public $total_localtax1;
+
+    /**
+     * Total local tax 2 amount
+     * @var float
+     */
+    public $total_localtax2;
+
+    /**
+     * Total amount with taxes
+     * @var float
+     */
+    public $total_ttc;
+
+    /**
+     * Liste d'options cumulables:
+     * Bit 0:	0 si TVA normal - 1 si TVA NPR
+     * Bit 1:	0 si ligne normal - 1 si bit discount (link to line into llx_remise_except)
+     * @var int
+     */
+    public $info_bits = 0;
+
+    /**
+     *  Constructor
+     *
+     *  @param	DoliDB		$db		Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+    }
 }

dolibarr/htdocs/core/class/comment.class.php

Indentation +334 added lines, -334 removed lines

@@ -21,347 +21,347 @@
  */
 class Comment extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element='comment';
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='comment';
 
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element='comment';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='comment';
 
-	/**
-	 * @var int Field with ID of parent key if this field has a parent
-	 */
-	public $fk_element ='';
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element ='';
 
-	public $element_type;
+    public $element_type;
 
-	/**
-	 * @var string description
-	 */
-	public $description;
+    /**
+     * @var string description
+     */
+    public $description;
 
-	public $tms;
+    public $tms;
 
-	public $datec;
+    public $datec;
 
-	/**
+    /**
      * @var int ID
      */
-	public $fk_user_author;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	public $import_key;
-
-	public $comments = array();
-
-	public $oldcopy;
-
-
-	/**
-	 *  Constructor
-	 *
-	 *  @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *  Create into database
-	 *
-	 *  @param	User	$user        	User that create
-	 *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int 		        	<0 if KO, Id of created object if OK
-	 */
-	function create($user, $notrigger=0)
-	{
-		global $conf, $langs;
-
-		$error=0;
-
-		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
-		$sql.= "description";
-		$sql.= ", datec";
-		$sql.= ", fk_element";
-		$sql.= ", element_type";
-		$sql.= ", fk_user_author";
-		$sql.= ", entity";
-		$sql.= ", import_key";
-		$sql.= ") VALUES (";
-		$sql.= "'".$this->db->escape($this->description)."'";
-		$sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
-		$sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
-		$sql.= ", '".$this->db->escape($this->element_type)."'";
-		$sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
-		$sql.= ", ".(!empty($this->entity)?$this->entity:'1');
-		$sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= ")";
-
-		//var_dump($this->db);
-		//echo $sql;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
-
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return $this->id;
-		}
-	}
-
-
-	/**
-	 *  Load object in memory from database
-	 *
-	 *  @param	int		$id			Id object
-	 *  @param	int		$ref		ref object
-	 *  @return int 		        <0 if KO, 0 if not found, >0 if OK
-	 */
-	function fetch($id, $ref='')
-	{
-		global $langs;
-
-		$sql = "SELECT";
-		$sql.= " c.rowid,";
-		$sql.= " c.description,";
-		$sql.= " c.datec,";
-		$sql.= " c.tms,";
-		$sql.= " c.fk_element,";
-		$sql.= " c.element_type,";
-		$sql.= " c.fk_user_author,";
-		$sql.= " c.entity,";
-		$sql.= " c.import_key";
-		$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-		$sql.= " WHERE c.rowid = ".$id;
-
-		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$num_rows = $this->db->num_rows($resql);
-
-			if ($num_rows)
-			{
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id					= $obj->rowid;
-				$this->description			= $obj->description;
-				$this->element_type			= $obj->element_type;
-				$this->datec				= $this->db->jdate($obj->datec);
-				$this->tms					= $obj->tms;
-				$this->fk_user_author		= $obj->fk_user_author;
-				$this->fk_element			= $obj->fk_element;
-				$this->entity				= $obj->entity;
-				$this->import_key			= $obj->import_key;
-			}
-
-			$this->db->free($resql);
-
-			if ($num_rows) return 1;
-			else return 0;
-		}
-		else
-		{
-			$this->error="Error ".$this->db->lasterror();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *  Update database
-	 *
-	 *  @param	User	$user        	User that modify
-	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *  @return int			         	<=0 if KO, >0 if OK
-	 */
-	function update(User $user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		// Clean parameters
-		if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
-		if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
-		if (isset($this->description)) $this->description=trim($this->description);
-
-
-		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
-		$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
-		$sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
-		$sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
-		$sql.= " element_type='".$this->db->escape($this->element_type)."',";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
-		$sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
-		$sql.= " WHERE rowid=".$this->id;
-
-		$this->db->begin();
-
-		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-
-	/**
-	 *	Delete task from database
-	 *
-	 *	@param	User	$user        	User that delete
-	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-
-		$error=0;
-
-		$this->db->begin();
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
-		$sql.= " WHERE rowid=".$this->id;
-
-		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
-
-		if (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Call trigger
-				$result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
-				if ($result < 0) { $error++; }
-				// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}else{
-			$this->db->commit();
-			return 1;
-		}
-	}
-
-
-	/**
-	 * Load comments linked with current task
-	 *
-	 * @param	string		$element_type		Element type
-	 * @param	int			$fk_element			Id of element
-	 * @return 	array							Comment array
-	 */
-	public function fetchAllFor($element_type, $fk_element)
-	{
-		global $db,$conf;
-		$this->comments = array();
-		if(!empty($element_type) && !empty($fk_element)) {
-			$sql = "SELECT";
-			$sql.= " c.rowid";
-			$sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
-			$sql.= " WHERE c.fk_element = ".$fk_element;
-			$sql.= " AND c.element_type = '".$db->escape($element_type)."'";
-			$sql.= " AND c.entity = ".$conf->entity;
-			$sql.= " ORDER BY c.tms DESC";
-
-			dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
-			$resql=$db->query($sql);
-			if ($resql)
-			{
-				$num_rows = $db->num_rows($resql);
-				if ($num_rows > 0)
-				{
-					while($obj = $db->fetch_object($resql))
-					{
-						$comment = new self($db);
-						$comment->fetch($obj->rowid);
-						$this->comments[] = $comment;
-					}
-				}
-				$db->free($resql);
-			} else {
-				$this->errors[]="Error ".$this->db->lasterror();
-				return -1;
-			}
-		}
-
-		return count($this->comments);
-	}
+    public $fk_user_author;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    public $import_key;
+
+    public $comments = array();
+
+    public $oldcopy;
+
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *  Create into database
+     *
+     *  @param	User	$user        	User that create
+     *  @param 	int		$notrigger	    0=launch triggers after, 1=disable triggers
+     *  @return int 		        	<0 if KO, Id of created object if OK
+     */
+    function create($user, $notrigger=0)
+    {
+        global $conf, $langs;
+
+        $error=0;
+
+        // Insert request
+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."comment (";
+        $sql.= "description";
+        $sql.= ", datec";
+        $sql.= ", fk_element";
+        $sql.= ", element_type";
+        $sql.= ", fk_user_author";
+        $sql.= ", entity";
+        $sql.= ", import_key";
+        $sql.= ") VALUES (";
+        $sql.= "'".$this->db->escape($this->description)."'";
+        $sql.= ", ".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null');
+        $sql.= ", '".(isset($this->fk_element)?$this->fk_element:"null")."'";
+        $sql.= ", '".$this->db->escape($this->element_type)."'";
+        $sql.= ", '".(isset($this->fk_user_author)?$this->fk_user_author:"null")."'";
+        $sql.= ", ".(!empty($this->entity)?$this->entity:'1');
+        $sql.= ", ".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
+        $sql.= ")";
+
+        //var_dump($this->db);
+        //echo $sql;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."projet_task_comment");
+
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('TASK_COMMENT_CREATE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return $this->id;
+        }
+    }
+
+
+    /**
+     *  Load object in memory from database
+     *
+     *  @param	int		$id			Id object
+     *  @param	int		$ref		ref object
+     *  @return int 		        <0 if KO, 0 if not found, >0 if OK
+     */
+    function fetch($id, $ref='')
+    {
+        global $langs;
+
+        $sql = "SELECT";
+        $sql.= " c.rowid,";
+        $sql.= " c.description,";
+        $sql.= " c.datec,";
+        $sql.= " c.tms,";
+        $sql.= " c.fk_element,";
+        $sql.= " c.element_type,";
+        $sql.= " c.fk_user_author,";
+        $sql.= " c.entity,";
+        $sql.= " c.import_key";
+        $sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
+        $sql.= " WHERE c.rowid = ".$id;
+
+        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $num_rows = $this->db->num_rows($resql);
+
+            if ($num_rows)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id					= $obj->rowid;
+                $this->description			= $obj->description;
+                $this->element_type			= $obj->element_type;
+                $this->datec				= $this->db->jdate($obj->datec);
+                $this->tms					= $obj->tms;
+                $this->fk_user_author		= $obj->fk_user_author;
+                $this->fk_element			= $obj->fk_element;
+                $this->entity				= $obj->entity;
+                $this->import_key			= $obj->import_key;
+            }
+
+            $this->db->free($resql);
+
+            if ($num_rows) return 1;
+            else return 0;
+        }
+        else
+        {
+            $this->error="Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     *  Update database
+     *
+     *  @param	User	$user        	User that modify
+     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+     *  @return int			         	<=0 if KO, >0 if OK
+     */
+    function update(User $user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        // Clean parameters
+        if (isset($this->fk_element)) $this->fk_project=(int) trim($this->fk_element);
+        if (isset($this->fk_user_author)) $this->fk_user_author=(int) trim($this->fk_user_author);
+        if (isset($this->description)) $this->description=trim($this->description);
+
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_comment SET";
+        $sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
+        $sql.= " datec=".($this->datec!=''?"'".$this->db->idate($this->datec)."'":'null').",";
+        $sql.= " fk_element=".(isset($this->fk_element)?$this->fk_element:"null").",";
+        $sql.= " element_type='".$this->db->escape($this->element_type)."',";
+        $sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
+        $sql.= " entity=".(!empty($this->entity)?$this->entity:'1').",";
+        $sql.= " import_key=".(!empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null");
+        $sql.= " WHERE rowid=".$this->id;
+
+        $this->db->begin();
+
+        dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('TASK_COMMENT_MODIFY',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    /**
+     *	Delete task from database
+     *
+     *	@param	User	$user        	User that delete
+     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+        $error=0;
+
+        $this->db->begin();
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."comment";
+        $sql.= " WHERE rowid=".$this->id;
+
+        $resql = $this->db->query($sql);
+        if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+
+        if (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Call trigger
+                $result=$this->call_trigger('TASK_COMMENT_DELETE',$user);
+                if ($result < 0) { $error++; }
+                // End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }else{
+            $this->db->commit();
+            return 1;
+        }
+    }
+
+
+    /**
+     * Load comments linked with current task
+     *
+     * @param	string		$element_type		Element type
+     * @param	int			$fk_element			Id of element
+     * @return 	array							Comment array
+     */
+    public function fetchAllFor($element_type, $fk_element)
+    {
+        global $db,$conf;
+        $this->comments = array();
+        if(!empty($element_type) && !empty($fk_element)) {
+            $sql = "SELECT";
+            $sql.= " c.rowid";
+            $sql.= " FROM ".MAIN_DB_PREFIX."comment as c";
+            $sql.= " WHERE c.fk_element = ".$fk_element;
+            $sql.= " AND c.element_type = '".$db->escape($element_type)."'";
+            $sql.= " AND c.entity = ".$conf->entity;
+            $sql.= " ORDER BY c.tms DESC";
+
+            dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
+            $resql=$db->query($sql);
+            if ($resql)
+            {
+                $num_rows = $db->num_rows($resql);
+                if ($num_rows > 0)
+                {
+                    while($obj = $db->fetch_object($resql))
+                    {
+                        $comment = new self($db);
+                        $comment->fetch($obj->rowid);
+                        $this->comments[] = $comment;
+                    }
+                }
+                $db->free($resql);
+            } else {
+                $this->errors[]="Error ".$this->db->lasterror();
+                return -1;
+            }
+        }
+
+        return count($this->comments);
+    }
 }