alxarafe / alixar

dolibarr/htdocs/margin/lib/margins.lib.php

Indentation +4 added lines, -4 removed lines

@@ -75,10 +75,10 @@
     if ($user->rights->societe->lire) {
         //$head[$h][0] = DOL_URL_ROOT."/margin/customerMargins.php";
         $head[$h][0] = BASE_URI . '?controller=margin&method=customerMargins';
-		$head[$h][1] = $langs->trans("CustomerMargins");
-		$head[$h][2] = 'customerMargins';
-		$h++;
-	}
+        $head[$h][1] = $langs->trans("CustomerMargins");
+        $head[$h][2] = 'customerMargins';
+        $h++;
+    }
 
     if ($user->rights->margins->read->all) {
         $title = 'UserMargins';

dolibarr/htdocs/core/lib/contact.lib.php

Indentation +19 added lines, -19 removed lines

@@ -32,34 +32,34 @@ 
  */
 function contact_prepare_head(Contact $object)
 {
-	global $db, $langs, $conf, $user;
+    global $db, $langs, $conf, $user;
 
-	$tab = 0;
-	$head = array();
+    $tab = 0;
+    $head = array();
 
     // $head[$tab][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id;
     $head[$tab][0] = BASE_URI . '?controller=contact&method=card&id=' . $object->id;
-	$head[$tab][1] = $langs->trans("Card");
-	$head[$tab][2] = 'card';
-	$tab++;
+    $head[$tab][1] = $langs->trans("Card");
+    $head[$tab][2] = 'card';
+    $tab++;
 
-	if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
-	{
-		$langs->load("ldap");
+    if ((! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE))
+        && (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || ! empty($user->admin)))
+    {
+        $langs->load("ldap");
 
         // $head[$tab][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id;
         $head[$tab][0] = BASE_URI . '?controller=contact&method=ldap&id=' . $object->id;
-		$head[$tab][1] = $langs->trans("LDAPCard");
-		$head[$tab][2] = 'ldap';
-		$tab++;
-	}
+        $head[$tab][1] = $langs->trans("LDAPCard");
+        $head[$tab][2] = 'ldap';
+        $tab++;
+    }
 
     // $head[$tab][0] = DOL_URL_ROOT.'/contact/perso.php?id='.$object->id;
     $head[$tab][0] = BASE_URI . '?controller=contact&method=perso&id=' . $object->id;
-	$head[$tab][1] = $langs->trans("PersonalInformations");
-	$head[$tab][2] = 'perso';
-	$tab++;
+    $head[$tab][1] = $langs->trans("PersonalInformations");
+    $head[$tab][2] = 'perso';
+    $tab++;
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
@@ -108,8 +108,8 @@ 
 	$head[$tab][2] = 'info';
 	$tab++;*/
 
-	complete_head_from_modules($conf,$langs,$object,$head,$tab,'contact','remove');
+    complete_head_from_modules($conf,$langs,$object,$head,$tab,'contact','remove');
 
-	return $head;
+    return $head;
 }
 

Braces +6 added lines, -2 removed lines

@@ -73,7 +73,9 @@ 
         // $head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
         $head[$tab][0] = BASE_URI . '?controller=contact&method=note&id=' . $object->id;
         $head[$tab][1] = $langs->trans("Note");
-        if($nbNote > 0) $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        if($nbNote > 0) {
+            $head[$tab][1].= ' <span class="badge">'.$nbNote.'</span>';
+        }
         $head[$tab][2] = 'note';
         $tab++;
     }
@@ -86,7 +88,9 @@ 
     // $head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
     $head[$tab][0] = BASE_URI . '?controller=contact&method=document&id=' . $object->id;
     $head[$tab][1] = $langs->trans("Documents");
-    if (($nbFiles+$nbLinks) > 0) $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    if (($nbFiles+$nbLinks) > 0) {
+        $head[$tab][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+    }
     $head[$tab][2] = 'documents';
     $tab++;
 

dolibarr/htdocs/don/card.php

Indentation +467 added lines, -467 removed lines

@@ -78,117 +78,117 @@ 
 
 if ($action == 'update')
 {
-	if (! empty($cancel))
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
+    if (! empty($cancel))
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+        exit;
+    }
 
-	$error=0;
+    $error=0;
 
     if (empty($donation_date))
     {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
         $action = "create";
         $error++;
     }
 
-	if (empty($amount))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
+    if (empty($amount))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+        $action = "create";
+        $error++;
+    }
 
-	if (! $error)
-	{
-		$object->fetch($id);
-
-		$object->firstname   = GETPOST("firstname",'alpha');
-		$object->lastname    = GETPOST("lastname",'alpha');
-		$object->societe     = GETPOST("societe",'alpha');
-		$object->address     = GETPOST("address",'alpha');
-		$object->amount      = price2num(GETPOST("amount",'alpha'));
-		$object->town        = GETPOST("town",'alpha');
-		$object->zip         = GETPOST("zipcode",'alpha');
+    if (! $error)
+    {
+        $object->fetch($id);
+
+        $object->firstname   = GETPOST("firstname",'alpha');
+        $object->lastname    = GETPOST("lastname",'alpha');
+        $object->societe     = GETPOST("societe",'alpha');
+        $object->address     = GETPOST("address",'alpha');
+        $object->amount      = price2num(GETPOST("amount",'alpha'));
+        $object->town        = GETPOST("town",'alpha');
+        $object->zip         = GETPOST("zipcode",'alpha');
         $object->country_id  = GETPOST('country_id', 'int');
         $object->email       = GETPOST("email",'alpha');
-		$object->date        = $donation_date;
-		$object->public      = GETPOST("public",'alpha');
-		$object->fk_project  = GETPOST("fk_project",'alpha');
-		$object->note_private= GETPOST("note_private",'none');
-		$object->note_public = GETPOST("note_public",'none');
-		$object->modepaymentid = GETPOST('modepayment','int');
-
-		// Fill array 'array_options' with data from add form
+        $object->date        = $donation_date;
+        $object->public      = GETPOST("public",'alpha');
+        $object->fk_project  = GETPOST("fk_project",'alpha');
+        $object->note_private= GETPOST("note_private",'none');
+        $object->note_public = GETPOST("note_public",'none');
+        $object->modepaymentid = GETPOST('modepayment','int');
+
+        // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+        if ($ret < 0) $error++;
 
-		if ($object->update($user) > 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-			exit;
-		}
-	}
+        if ($object->update($user) > 0)
+        {
+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+            exit;
+        }
+    }
 }
 
 if ($action == 'add')
 {
-	if (! empty($cancel))
-	{
-		header("Location: index.php");
-		exit;
-	}
+    if (! empty($cancel))
+    {
+        header("Location: index.php");
+        exit;
+    }
 
-	$error=0;
+    $error=0;
 
     if (empty($donation_date))
     {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
         $action = "create";
         $error++;
     }
 
-	if (empty($amount))
-	{
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
-		$action = "create";
-		$error++;
-	}
+    if (empty($amount))
+    {
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors');
+        $action = "create";
+        $error++;
+    }
 
-	if (! $error)
-	{
-		$object->firstname   = GETPOST("firstname",'alpha');
-		$object->lastname    = GETPOST("lastname",'alpha');
-		$object->societe     = GETPOST("societe",'alpha');
-		$object->address     = GETPOST("address",'alpha');
-		$object->amount      = price2num(GETPOST("amount",'alpha'));
-		$object->zip         = GETPOST("zipcode",'alpha');
-		$object->town        = GETPOST("town",'alpha');
+    if (! $error)
+    {
+        $object->firstname   = GETPOST("firstname",'alpha');
+        $object->lastname    = GETPOST("lastname",'alpha');
+        $object->societe     = GETPOST("societe",'alpha');
+        $object->address     = GETPOST("address",'alpha');
+        $object->amount      = price2num(GETPOST("amount",'alpha'));
+        $object->zip         = GETPOST("zipcode",'alpha');
+        $object->town        = GETPOST("town",'alpha');
         $object->country_id  = GETPOST('country_id', 'int');
         $object->email       = GETPOST("email",'alpha');
-		$object->date        = $donation_date;
-		$object->note_private= GETPOST("note_private",'none');
-		$object->note_public = GETPOST("note_public",'none');
-		$object->public      = GETPOST("public",'alpha');
-		$object->fk_project  = GETPOST("fk_project",'alpha');
-		$object->modepaymentid = GETPOST('modepayment','int');
-
-		// Fill array 'array_options' with data from add form
+        $object->date        = $donation_date;
+        $object->note_private= GETPOST("note_private",'none');
+        $object->note_public = GETPOST("note_public",'none');
+        $object->public      = GETPOST("public",'alpha');
+        $object->fk_project  = GETPOST("fk_project",'alpha');
+        $object->modepaymentid = GETPOST('modepayment','int');
+
+        // Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
-
-		$res = $object->create($user);
-		if ($res > 0)
-		{
-			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
-			exit;
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+        if ($ret < 0) $error++;
+
+        $res = $object->create($user);
+        if ($res > 0)
+        {
+            header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 }
 if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer)
 {
@@ -207,46 +207,46 @@ 
 }
 if ($action == 'valid_promesse')
 {
-	$object->fetch($id);
-	if ($object->valid_promesse($id, $user->id) >= 0)
-	{
-		setEventMessages($langs->trans("DonationValidated", $object->ref), null);
+    $object->fetch($id);
+    if ($object->valid_promesse($id, $user->id) >= 0)
+    {
+        setEventMessages($langs->trans("DonationValidated", $object->ref), null);
 
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+        exit;
+    }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_cancel')
 {
-	$object->fetch($id);
-	if ($object->set_cancel($id) >= 0)
+    $object->fetch($id);
+    if ($object->set_cancel($id) >= 0)
     {
         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
         exit;
     }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 if ($action == 'set_paid')
 {
-	$object->fetch($id);
-	if ($object->set_paid($id, $modepayment) >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
-		exit;
-	}
+    $object->fetch($id);
+    if ($object->set_paid($id, $modepayment) >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
+        exit;
+    }
     else {
-	    setEventMessages($object->error, $object->errors, 'errors');
+        setEventMessages($object->error, $object->errors, 'errors');
     }
 }
 else if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 // Actions to build doc
@@ -321,50 +321,50 @@ 
 
 if ($action == 'create')
 {
-	print load_fiche_titre($langs->trans("AddDonation"));
+    print load_fiche_titre($langs->trans("AddDonation"));
 
-	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
+    print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
 
-	dol_fiche_head('');
+    dol_fiche_head('');
 
-	print '<table class="border" width="100%">';
-	print '<tbody>';
+    print '<table class="border" width="100%">';
+    print '<tbody>';
 
-	// Ref
-	print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
+    // Ref
+    print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
 
-	// Company
-	if (! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
-		// Thirdparty
-		print '<td>' . $langs->trans('Customer') . '</td>';
-		if ($soc->id > 0 && ! GETPOST('fac_rec','alpha'))
-		{
-			print '<td colspan="2">';
-			print $soc->getNomUrl(1);
-			print '<input type="hidden" name="socid" value="' . $soc->id . '">';
-			// Outstanding Bill
-			$outstandingBills = $soc->get_OutstandingBill();
-			print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
-			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
-			if ($soc->outstanding_limit != '')
-			{
-				if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
-				print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
-			}
-			print ')';
-			print '</td>';
-		}
-		else
-		{
-			print '<td colspan="2">';
-			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
-			// Option to reload page to retrieve customer informations. Note, this clear other input
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
-			{
-				print '<script type="text/javascript">
+    // Company
+    if (! empty($conf->societe->enabled) && ! empty($conf->global->DONATION_USE_THIRDPARTIES))
+    {
+        // Thirdparty
+        print '<td>' . $langs->trans('Customer') . '</td>';
+        if ($soc->id > 0 && ! GETPOST('fac_rec','alpha'))
+        {
+            print '<td colspan="2">';
+            print $soc->getNomUrl(1);
+            print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+            // Outstanding Bill
+            $outstandingBills = $soc->get_OutstandingBill();
+            print ' (' . $langs->trans('CurrentOutstandingBill') . ': ';
+            print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
+            if ($soc->outstanding_limit != '')
+            {
+                if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+                print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
+            }
+            print ')';
+            print '</td>';
+        }
+        else
+        {
+            print '<td colspan="2">';
+            print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+            // Option to reload page to retrieve customer informations. Note, this clear other input
+            if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE))
+            {
+                print '<script type="text/javascript">
 				$(document).ready(function() {
 					$("#socid").change(function() {
 						var socid = $(this).val();
@@ -374,82 +374,82 @@ 
 					});
 				});
 				</script>';
-			}
+            }
             //print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">'.$langs->trans("AddThirdParty").'</a>';
             print ' <a href="' . BASE_URI . '?controller=societe&method=card&action=create&client=3&fournisseur=0&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create') . '">' . $langs->trans("AddThirdParty") . '</a>';
-			print '</td>';
-		}
-		print '</tr>' . "\n";
-	}
+            print '</td>';
+        }
+        print '</tr>' . "\n";
+    }
 
-	// Date
-	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($donation_date?$donation_date:-1, '', '', '', '', "add", 1, 1);
-	print '</td>';
+    // Date
+    print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Date").'</td><td>';
+    print $form->selectDate($donation_date?$donation_date:-1, '', '', '', '', "add", 1, 1);
+    print '</td>';
 
-	// Amount
-	print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.dol_escape_htmltag(GETPOST("amount")).'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+    // Amount
+    print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.dol_escape_htmltag(GETPOST("amount")).'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
-	// Public donation
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
-	print "</td></tr>\n";
+    // Public donation
+    print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+    print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
+    print "</td></tr>\n";
 
-	if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
-		print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
-		print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
-		print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address")).'</textarea></td></tr>';
-
-		// Zip / Town
-		print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-		print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
-		print ' ';
-		print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-		print '</tr>';
-
-		// Country
-		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
-		print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-		print '</td></tr>';
-
-		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
-	}
+    if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
+    {
+        print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
+        print "<tr>".'<td>'.$langs->trans("Address").'</td><td>';
+        print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="3">'.dol_escape_htmltag(GETPOST("address")).'</textarea></td></tr>';
+
+        // Zip / Town
+        print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
+        print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+        print ' ';
+        print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+        print '</tr>';
+
+        // Country
+        print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
+        print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
+        if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+        print '</td></tr>';
 
-	// Payment mode
-	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-	$selected = GETPOST('modepayment','int');
-	$form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
-	print "</td></tr>\n";
+        print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
+    }
 
-	// Public note
-	print '<tr>';
-	print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
-	print '<td>';
+    // Payment mode
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
+    $selected = GETPOST('modepayment','int');
+    $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
+    print "</td></tr>\n";
+
+    // Public note
+    print '<tr>';
+    print '<td class="tdtop">' . $langs->trans('NotePublic') . '</td>';
+    print '<td>';
 
     $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-	print $doleditor->Create(1);
-	print '</td></tr>';
-
-	// Private note
-	if (empty($user->societe_id)) {
-		print '<tr>';
-		print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
-		print '<td>';
-
-		$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-		print $doleditor->Create(1);
-		print '</td></tr>';
-	}
+    print $doleditor->Create(1);
+    print '</td></tr>';
+
+    // Private note
+    if (empty($user->societe_id)) {
+        print '<tr>';
+        print '<td class="tdtop">' . $langs->trans('NotePrivate') . '</td>';
+        print '<td>';
 
-	if (! empty($conf->projet->enabled))
+        $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+        print $doleditor->Create(1);
+        print '</td></tr>';
+    }
+
+    if (! empty($conf->projet->enabled))
     {
         print "<tr><td>".$langs->trans("Project")."</td><td>";
         $formproject->select_projects(-1, $projectid,'fk_project', 0, 0, 1, 1);
-		print "</td></tr>\n";
+        print "</td></tr>\n";
     }
 
     // Other attributes
@@ -458,21 +458,21 @@ 
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-		print $object->showOptionals($extrafields,'edit',$parameters);
+        print $object->showOptionals($extrafields,'edit',$parameters);
     }
 
     print '</tbody>';
-	print "</table>\n";
+    print "</table>\n";
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div class="center">';
-	print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
-	print '</div>';
+    print '<div class="center">';
+    print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input type="button" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" onClick="javascript:history.go(-1)">';
+    print '</div>';
 
-	print "</form>\n";
+    print "</form>\n";
 }
 
 
@@ -484,80 +484,80 @@ 
 
 if (! empty($id) && $action == 'edit')
 {
-	$result=$object->fetch($id);
-	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
-	}
-	$result=$object->fetch_optionals();
-	if ($result < 0) {
-		dol_print_error($db); exit;
-	}
+    $result=$object->fetch($id);
+    if ($result < 0) {
+        dol_print_error($db,$object->error); exit;
+    }
+    $result=$object->fetch_optionals();
+    if ($result < 0) {
+        dol_print_error($db); exit;
+    }
 
-	$hselected='card';
-	$head = donation_prepare_head($object);
+    $hselected='card';
+    $head = donation_prepare_head($object);
 
-	print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-	print '<input type="hidden" name="amount" value="'.$object->amount.'">';
+    print '<form name="update" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
+    print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+    print '<input type="hidden" name="amount" value="'.$object->amount.'">';
 
 
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
+    dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic');
 
-	print '<table class="border" width="100%">';
+    print '<table class="border" width="100%">';
 
-	// Ref
-	print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">';
-	print $object->getNomUrl();
-	print '</td>';
-	print '</tr>';
+    // Ref
+    print '<tr><td>'.$langs->trans("Ref").'</td><td colspan="2">';
+    print $object->getNomUrl();
+    print '</td>';
+    print '</tr>';
 
-	// Date
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
-	print $form->selectDate($object->date,'','','','',"update");
-	print '</td>';
+    // Date
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Date").'</td><td>';
+    print $form->selectDate($object->date,'','','','',"update");
+    print '</td>';
 
-	// Amount
-	if ($object->statut == 0)
-	{
-		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
-	{
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
-		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
-		print '</td></tr>';
-	}
+    // Amount
+    if ($object->statut == 0)
+    {
+        print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
+    }
+    else
+    {
+        print '<tr><td>'.$langs->trans("Amount").'</td><td>';
+        print price($object->amount,0,$langs,0,0,-1,$conf->currency);
+        print '</td></tr>';
+    }
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
-	print $form->selectyesno("public",1,1);
-	print "</td>";
-	print "</tr>\n";
+    print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>";
+    print $form->selectyesno("public",1,1);
+    print "</td>";
+    print "</tr>\n";
 
-	$langs->load("companies");
-	print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
-	print '<tr><td>'.$langs->trans("Address").'</td><td>';
-	print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address).'</textarea></td></tr>';
+    $langs->load("companies");
+    print '<tr><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="maxwidth200" value="'.dol_escape_htmltag($object->societe).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" class="maxwidth200" value="'.dol_escape_htmltag($object->lastname).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" class="maxwidth200" value="'.dol_escape_htmltag($object->firstname).'"></td></tr>';
+    print '<tr><td>'.$langs->trans("Address").'</td><td>';
+    print '<textarea name="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag($object->address).'</textarea></td></tr>';
 
     // Zip / Town
     print '<tr><td>'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td>';
-	print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
+    print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6);
     print ' ';
-	print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
-	print '</tr>';
+    print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id'));
+    print '</tr>';
 
-	// Country
-	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
-	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-	print '</td></tr>';
+    // Country
+    print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
+    print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
+    if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    print '</td></tr>';
 
-	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
+    print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
 
-	// Payment mode
+    // Payment mode
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
     if ($object->modepaymentid) $selected = $object->modepaymentid;
     else $selected = '';
@@ -565,16 +565,16 @@ 
     print "</td></tr>\n";
 
     // Status
-	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+    print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
     // Project
     if (! empty($conf->projet->enabled))
     {
-    	$formproject=new FormProjets($db);
+        $formproject=new FormProjets($db);
 
         $langs->load('projects');
         print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 0, 1, 1);
+        $formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 0, 1, 1);
         print '</td></tr>';
     }
 
@@ -584,16 +584,16 @@ 
     print $hookmanager->resPrint;
     if (empty($reshook))
     {
-      	print $object->showOptionals($extrafields,'edit');
+            print $object->showOptionals($extrafields,'edit');
     }
 
-	print "</table>\n";
+    print "</table>\n";
 
-	dol_fiche_end();
+    dol_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp; &nbsp; <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
 
-	print "</form>\n";
+    print "</form>\n";
 }
 
 
@@ -605,68 +605,68 @@ 
 /* ************************************************************ */
 if (! empty($id) && $action != 'edit')
 {
-	// Confirmation delete
+    // Confirmation delete
     if ($action == 'delete')
     {
         $text=$langs->trans("ConfirmDeleteADonation");
         print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("DeleteADonation"),$text,"confirm_delete",'','',1);
     }
 
-	$result=$object->fetch($id);
-	if ($result < 0) {
-		dol_print_error($db,$object->error); exit;
-	}
-	$result=$object->fetch_optionals();
-	if ($result < 0) {
-		dol_print_error($db); exit;
-	}
+    $result=$object->fetch($id);
+    if ($result < 0) {
+        dol_print_error($db,$object->error); exit;
+    }
+    $result=$object->fetch_optionals();
+    if ($result < 0) {
+        dol_print_error($db); exit;
+    }
 
-	$hselected='card';
+    $hselected='card';
 
-	$head = donation_prepare_head($object);
-	dol_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'generic');
+    $head = donation_prepare_head($object);
+    dol_fiche_head($head, $hselected, $langs->trans("Donation"), -1, 'generic');
 
-	// Print form confirm
-	print $formconfirm;
+    // Print form confirm
+    print $formconfirm;
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
+                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
+                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 // $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&methos=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
 
     dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
@@ -678,195 +678,195 @@ 
 
     print '<table class="border" width="100%">';
 
-	// Date
-	print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
-	print dol_print_date($object->date,"day");
-	print "</td>";
+    // Date
+    print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td colspan="2">';
+    print dol_print_date($object->date,"day");
+    print "</td>";
 
     print '<tr><td>'.$langs->trans("Amount").'</td><td colspan="2">';
-	print price($object->amount,0,$langs,0,0,-1,$conf->currency);
-	print '</td></tr>';
+    print price($object->amount,0,$langs,0,0,-1,$conf->currency);
+    print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("PublicDonation").'</td><td colspan="2">';
-	print yn($object->public);
-	print '</td></tr>';
+    print '<tr><td>'.$langs->trans("PublicDonation").'</td><td colspan="2">';
+    print yn($object->public);
+    print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
-	print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
-	print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Company").'</td><td colspan="2">'.$object->societe.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Lastname").'</td><td colspan="2">'.$object->lastname.'</td></tr>';
+    print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="2">'.$object->firstname.'</td></tr>';
 
-	// Payment mode
-	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-	$form->form_modes_reglement(null, $object->modepaymentid,'none');
-	print "</td></tr>\n";
+    // Payment mode
+    print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
+    $form->form_modes_reglement(null, $object->modepaymentid,'none');
+    print "</td></tr>\n";
 
-	// Other attributes
-	$cols = 2;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+    // Other attributes
+    $cols = 2;
+    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-	print '</table>';
+    print '</table>';
 
-	print '</div>';
-	print '<div class="fichehalfright">';
-	print '<div class="ficheaddleft">';
+    print '</div>';
+    print '<div class="fichehalfright">';
+    print '<div class="ficheaddleft">';
 
-	/*
+    /*
 	 * Payments
 	 */
-	$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
-	$sql.= "c.code as type_code,c.libelle as paiement_type";
-	$sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
-	$sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
-	$sql.= ", ".MAIN_DB_PREFIX."don as d";
-	$sql.= " WHERE d.rowid = '".$id."'";
-	$sql.= " AND p.fk_donation = d.rowid";
-	$sql.= " AND d.entity IN (".getEntity('donation').")";
-	$sql.= " AND p.fk_typepayment = c.id";
-	$sql.= " ORDER BY dp";
-
-	//print $sql;
-	$resql = $db->query($sql);
-	if ($resql)
-	{
-		$num = $db->num_rows($resql);
-		$i = 0; $total = 0;
-		print '<table class="noborder" width="100%">';
-		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans("RefPayment").'</td>';
-		print '<td>'.$langs->trans("Date").'</td>';
-		print '<td>'.$langs->trans("Type").'</td>';
-   		print '<td align="right">'.$langs->trans("Amount").'</td>';
-   		print '</tr>';
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($resql);
-
-			print '<tr class="oddeven"><td>';
+    $sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,";
+    $sql.= "c.code as type_code,c.libelle as paiement_type";
+    $sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
+    $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c ";
+    $sql.= ", ".MAIN_DB_PREFIX."don as d";
+    $sql.= " WHERE d.rowid = '".$id."'";
+    $sql.= " AND p.fk_donation = d.rowid";
+    $sql.= " AND d.entity IN (".getEntity('donation').")";
+    $sql.= " AND p.fk_typepayment = c.id";
+    $sql.= " ORDER BY dp";
+
+    //print $sql;
+    $resql = $db->query($sql);
+    if ($resql)
+    {
+        $num = $db->num_rows($resql);
+        $i = 0; $total = 0;
+        print '<table class="noborder" width="100%">';
+        print '<tr class="liste_titre">';
+        print '<td>'.$langs->trans("RefPayment").'</td>';
+        print '<td>'.$langs->trans("Date").'</td>';
+        print '<td>'.$langs->trans("Type").'</td>';
+            print '<td align="right">'.$langs->trans("Amount").'</td>';
+            print '</tr>';
+
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($resql);
+
+            print '<tr class="oddeven"><td>';
             // print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.'</a></td>';
             print '<a href="' . BASE_URI . '?controller=don/payment&method=card&id=' . $objp->rowid . '">' . img_object($langs->trans("Payment"), "payment") . ' ' . $objp->rowid . '</a></td>';
-			print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
-		    $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
+            print '<td>'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
+            $labeltype=$langs->trans("PaymentType".$objp->type_code)!=("PaymentType".$objp->type_code)?$langs->trans("PaymentType".$objp->type_code):$objp->paiement_type;
             print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-			print '<td align="right">'.price($objp->amount)."</td>\n";
-			print "</tr>";
-			$totalpaid += $objp->amount;
-			$i++;
-		}
-
-		if ($object->paid == 0)
-		{
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
-
-			$remaintopay = $object->amount - $totalpaid;
-
-			print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
-			print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':'').'><b>'.price($remaintopay)."</b></td></tr>\n";
-		}
-		print "</table>";
-		$db->free($resql);
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+            print '<td align="right">'.price($objp->amount)."</td>\n";
+            print "</tr>";
+            $totalpaid += $objp->amount;
+            $i++;
+        }
+
+        if ($object->paid == 0)
+        {
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\">".price($totalpaid)."</td></tr>\n";
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\">".price($object->amount)."</td></tr>\n";
+
+            $remaintopay = $object->amount - $totalpaid;
+
+            print "<tr><td colspan=\"3\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>";
+            print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopay"':'').'><b>'.price($remaintopay)."</b></td></tr>\n";
+        }
+        print "</table>";
+        $db->free($resql);
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 
-	print '</div>';
-	print '</div>';
-	print '</div>';
+    print '</div>';
+    print '</div>';
+    print '</div>';
 
-	print '<div class="clearboth"></div>';
+    print '<div class="clearboth"></div>';
 
     dol_fiche_end();
 
-	$remaintopay = $object->amount - $totalpaid;
+    $remaintopay = $object->amount - $totalpaid;
 
-	// Actions buttons
+    // Actions buttons
 
-	print '<div class="tabsAction">';
+    print '<div class="tabsAction">';
 
-	print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
+    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
-	if ($object->statut == 0)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=valid_promesse">'.$langs->trans("ValidPromess").'</a></div>';
-	}
+    if ($object->statut == 0)
+    {
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=valid_promesse">'.$langs->trans("ValidPromess").'</a></div>';
+    }
 
     if (($object->statut == 0 || $object->statut == 1) && $totalpaid == 0 && $object->paid == 0)
     {
         print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_cancel">'.$langs->trans("ClassifyCanceled")."</a></div>";
     }
 
-	// Create payment
-	if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
-	{
-		if ($remaintopay == 0)
-		{
-			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
-		}
-		else
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
-		}
-	}
+    // Create payment
+    if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer)
+    {
+        if ($remaintopay == 0)
+        {
+            print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
+        }
+        else
+        {
+            print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
+        }
+    }
 
-	// Classify 'paid'
-	if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
-	{
-		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
-	}
+    // Classify 'paid'
+    if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
+    {
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
+    }
 
-	// Delete
-	if ($user->rights->don->supprimer)
-	{
-		if ($object->statut == -1 || $object->statut == 0)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
-		}
-		else
-		{
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
-		}
-	}
-	else
-	{
-		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
-	}
+    // Delete
+    if ($user->rights->don->supprimer)
+    {
+        if ($object->statut == -1 || $object->statut == 0)
+        {
+            print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
+        }
+        else
+        {
+            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
+        }
+    }
+    else
+    {
+        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
+    }
 
-	print "</div>";
+    print "</div>";
 
 
     print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	/*
+    /*
 	 * Documents generes
 	 */
-	$filename	=	dol_sanitizeFileName($object->id);
-	$filedir	=	$conf->don->dir_output . "/" . dol_sanitizeFileName($object->id);
+    $filename	=	dol_sanitizeFileName($object->id);
+    $filedir	=	$conf->don->dir_output . "/" . dol_sanitizeFileName($object->id);
     $urlsource = $_SERVER['PHP_SELF'] . '&rowid=' . $object->id;
-	$genallowed	=	(($object->paid == 0 || $user->admin) && $user->rights->don->lire);
-	$delallowed	=	$user->rights->don->creer;
+    $genallowed	=	(($object->paid == 0 || $user->admin) && $user->rights->don->lire);
+    $delallowed	=	$user->rights->don->creer;
 
-	print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
+    print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);
 
-	// Show links to link elements
-	$linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
-	$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+    // Show links to link elements
+    $linktoelem = $form->showLinkToObjectBlock($object, null, array('don'));
+    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
-		// Show online payment link
-		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
+        // Show online payment link
+        $useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
 
-		if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
-		{
-			print '<br><!-- Link to pay -->'."\n";
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-			print showOnlinePaymentUrl('donation', $object->ref).'<br>';
-		}
+        if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
+        {
+            print '<br><!-- Link to pay -->'."\n";
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+            print showOnlinePaymentUrl('donation', $object->ref).'<br>';
+        }
 
-	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	print '</div></div></div>';
+    print '</div></div></div>';
 }
 
 llxFooter();

Braces +41 added lines, -35 removed lines

@@ -74,7 +74,9 @@ 
  */
 
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if ($action == 'update')
 {
@@ -122,7 +124,9 @@ 
 
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		if ($object->update($user) > 0)
 		{
@@ -176,15 +180,16 @@ 
 
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		$res = $object->create($user);
 		if ($res > 0)
 		{
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -198,8 +203,7 @@ 
     {
         header("Location: index.php");
         exit;
-    }
-    else
+    } else
     {
         dol_syslog($object->error,LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
@@ -214,8 +218,7 @@ 
 
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -226,8 +229,7 @@ 
     {
         header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
         exit;
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -238,12 +240,10 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-else if ($action == 'classin' && $user->rights->don->creer)
+} else if ($action == 'classin' && $user->rights->don->creer)
 {
 	$object->fetch($id);
 	$object->setProject($projectid);
@@ -351,13 +351,14 @@ 
 			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
 			if ($soc->outstanding_limit != '')
 			{
-				if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+				if ($outstandingBills > $soc->outstanding_limit) {
+				    print img_warning($langs->trans("OutstandingBillReached"));
+				}
 				print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 			}
 			print ')';
 			print '</td>';
-		}
-		else
+		} else
 		{
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -413,7 +414,9 @@ 
 		// Country
 		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
 		print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		if ($user->admin) {
+		    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		}
 		print '</td></tr>';
 
 		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
@@ -522,8 +525,7 @@ 
 	if ($object->statut == 0)
 	{
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
+	} else
 	{
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
@@ -552,15 +554,20 @@ 
 	// Country
 	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
 	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	if ($user->admin) {
+	    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	}
 	print '</td></tr>';
 
 	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
 
 	// Payment mode
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-    if ($object->modepaymentid) $selected = $object->modepaymentid;
-    else $selected = '';
+    if ($object->modepaymentid) {
+        $selected = $object->modepaymentid;
+    } else {
+        $selected = '';
+    }
     $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
     print "</td></tr>\n";
 
@@ -640,8 +647,9 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        }
 	            if ($action == 'classify') {
 	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
@@ -766,8 +774,7 @@ 
 		}
 		print "</table>";
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -804,8 +811,7 @@ 
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
-		}
-		else
+		} else
 		{
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
 		}
@@ -823,13 +829,11 @@ 
 		if ($object->statut == -1 || $object->statut == 0)
 		{
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete">'.$langs->trans("Delete")."</a></div>";
-		}
-		else
+		} else
 		{
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
-	}
-	else
+	} else
 	{
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
@@ -857,9 +861,11 @@ 
 		// Show online payment link
 		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
 
-		if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
+		if ($useonlinepayment) {
+		    //$object->statut != Facture::STATUS_DRAFT &&
 		{
 			print '<br><!-- Link to pay -->'."\n";
+		}
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 			print showOnlinePaymentUrl('donation', $object->ref).'<br>';
 		}

dolibarr/htdocs/don/note.php

Indentation +43 added lines, -43 removed lines

@@ -63,8 +63,8 @@ 
 
 if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 /*
@@ -80,61 +80,61 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$object = new Don($db);
-	$object->fetch($id,$ref);
+    $object = new Don($db);
+    $object->fetch($id,$ref);
 
-	$head = donation_prepare_head($object);
+    $head = donation_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'generic');
+    dol_fiche_head($head, 'note', $langs->trans("Donation"), -1, 'generic');
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
+                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
                     $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '&id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 //$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
-	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+    dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
-	$cssclass="titlefield";
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+    $cssclass="titlefield";
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 llxFooter();

Braces +6 added lines, -3 removed lines

@@ -47,7 +47,9 @@ 
 
 // Security check
 $socid=0;
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'don',$id,'');
 
 $object = new Don($db);
@@ -98,11 +100,12 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 	            if ($action == 'classify') {
 	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+	        }
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
 	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

dolibarr/htdocs/don/list.php

Indentation +79 added lines, -79 removed lines

@@ -56,11 +56,11 @@ 
 
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers
 {
-	$search_all="";
+    $search_all="";
     $search_ref="";
-	$search_company="";
-	$search_name="";
-	$search_amount="";
+    $search_company="";
+    $search_name="";
+    $search_amount="";
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -94,7 +94,7 @@ 
 $sql.= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
 if ($statut != '' && $statut != '-1')
 {
-	$sql .= " AND d.fk_statut IN (".$db->escape($statut).")";
+    $sql .= " AND d.fk_statut IN (".$db->escape($statut).")";
 }
 if (trim($search_ref) != '')
 {
@@ -119,13 +119,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$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;
-	}
+    $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);
@@ -133,34 +133,34 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
+    $num = $db->num_rows($resql);
+    $i = 0;
 
-	$param = '&statut='.$statut;
+    $param = '&statut='.$statut;
     //if ($page > 0) $param.= '&page='.$page;
-	if ($optioncss != '') $param.='&optioncss='.$optioncss;
+    if ($optioncss != '') $param.='&optioncss='.$optioncss;
 
-	$newcardbutton='';
-	if ($user->rights->don->creer)
-	{
+    $newcardbutton='';
+    if ($user->rights->don->creer)
+    {
         // $newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/don/card.php?action=create"><span class="valignmiddle">'.$langs->trans('NewDonation').'</span>';
         $newcardbutton = '<a class="butActionNew" href="' . BASE_URI . '?controller=don&method=card&action=create"><span class="valignmiddle">' . $langs->trans('NewDonation') . '</span>';
-		$newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
-		$newcardbutton.= '</a>';
-	}
+        $newcardbutton.= '<span class="fa fa-plus-circle valignmiddle"></span>';
+        $newcardbutton.= '</a>';
+    }
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
     if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
     print '<input type="hidden" name="page" value="'.$page.'">';
-	print '<input type="hidden" name="type" value="'.$type.'">';
+    print '<input type="hidden" name="type" value="'.$type.'">';
 
-	print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num,$nbtotalofrecords, 'title_generic.png', 0, $newcardbutton);
+    print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num,$nbtotalofrecords, 'title_generic.png', 0, $newcardbutton);
 
-	if ($search_all)
+    if ($search_all)
     {
         foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
         print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all) . join(', ',$fieldstosearchall).'</div>';
@@ -195,65 +195,65 @@ 
     $searchpicto=$form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
     print '</td>';
-	print "</tr>\n";
+    print "</tr>\n";
 
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid","", $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"d.societe","", $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Name",$_SERVER["PHP_SELF"],"d.lastname","", $param,"",$sortfield,$sortorder);
-	print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"d.datedon","", $param,'align="center"',$sortfield,$sortorder);
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    print_liste_field_titre("Project",$_SERVER["PHP_SELF"],"fk_projet","", $param,"",$sortfield,$sortorder);
-	}
-	print_liste_field_titre("Amount",$_SERVER["PHP_SELF"],"d.amount","", $param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.fk_statut","", $param,'align="right"',$sortfield,$sortorder);
-	print_liste_field_titre('');
-	print "</tr>\n";
+    print '<tr class="liste_titre">';
+    print_liste_field_titre("Ref",$_SERVER["PHP_SELF"],"d.rowid","", $param,"",$sortfield,$sortorder);
+    print_liste_field_titre("Company",$_SERVER["PHP_SELF"],"d.societe","", $param,"",$sortfield,$sortorder);
+    print_liste_field_titre("Name",$_SERVER["PHP_SELF"],"d.lastname","", $param,"",$sortfield,$sortorder);
+    print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"d.datedon","", $param,'align="center"',$sortfield,$sortorder);
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        print_liste_field_titre("Project",$_SERVER["PHP_SELF"],"fk_projet","", $param,"",$sortfield,$sortorder);
+    }
+    print_liste_field_titre("Amount",$_SERVER["PHP_SELF"],"d.amount","", $param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"d.fk_statut","", $param,'align="right"',$sortfield,$sortorder);
+    print_liste_field_titre('');
+    print "</tr>\n";
 
-	while ($i < min($num,$limit))
-	{
-		$objp = $db->fetch_object($resql);
+    while ($i < min($num,$limit))
+    {
+        $objp = $db->fetch_object($resql);
 
-		print '<tr class="oddeven">';
-		$donationstatic->id=$objp->rowid;
-		$donationstatic->ref=$objp->rowid;
-		$donationstatic->lastname=$objp->lastname;
-		$donationstatic->firstname=$objp->firstname;
-		print "<td>".$donationstatic->getNomUrl(1)."</td>\n";
+        print '<tr class="oddeven">';
+        $donationstatic->id=$objp->rowid;
+        $donationstatic->ref=$objp->rowid;
+        $donationstatic->lastname=$objp->lastname;
+        $donationstatic->firstname=$objp->firstname;
+        print "<td>".$donationstatic->getNomUrl(1)."</td>\n";
         print "<td>".$objp->societe."</td>\n";
-		print "<td>".$donationstatic->getFullName($langs)."</td>\n";
-		print '<td align="center">'.dol_print_date($db->jdate($objp->datedon),'day').'</td>';
-		if (! empty($conf->projet->enabled))
-		{
-			print "<td>";
-			if ($objp->pid)
-			{
-				$projectstatic->id=$objp->pid;
-				$projectstatic->ref=$objp->ref;
-				$projectstatic->id=$objp->pid;
-				$projectstatic->public=$objp->public;
-				$projectstatic->title=$objp->title;
-				print $projectstatic->getNomUrl(1);
-			}
-			else print '&nbsp;';
-			print "</td>\n";
-		}
-		print '<td align="right">'.price($objp->amount).'</td>';
-		print '<td align="right">'.$donationstatic->LibStatut($objp->statut,5).'</td>';
+        print "<td>".$donationstatic->getFullName($langs)."</td>\n";
+        print '<td align="center">'.dol_print_date($db->jdate($objp->datedon),'day').'</td>';
+        if (! empty($conf->projet->enabled))
+        {
+            print "<td>";
+            if ($objp->pid)
+            {
+                $projectstatic->id=$objp->pid;
+                $projectstatic->ref=$objp->ref;
+                $projectstatic->id=$objp->pid;
+                $projectstatic->public=$objp->public;
+                $projectstatic->title=$objp->title;
+                print $projectstatic->getNomUrl(1);
+            }
+            else print '&nbsp;';
+            print "</td>\n";
+        }
+        print '<td align="right">'.price($objp->amount).'</td>';
+        print '<td align="right">'.$donationstatic->LibStatut($objp->statut,5).'</td>';
         print '<td></td>';
-		print "</tr>";
-		$i++;
-	}
-	print "</table>";
-	print '</div>';
+        print "</tr>";
+        $i++;
+    }
+    print "</table>";
+    print '</div>';
     print "</form>\n";
     $db->free($resql);
 }
 else
 {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 llxFooter();

dolibarr/htdocs/don/info.php

Braces +6 added lines, -3 removed lines

@@ -40,7 +40,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid = $user->societe_id;
+if ($user->societe_id) {
+    $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -80,11 +82,12 @@ 
     $langs->load("projects");
     $morehtmlref .= $langs->trans('Project') . ' ';
     if ($user->rights->don->creer) {
-        if ($action != 'classify')
-            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+        if ($action != 'classify') {
+                    // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
             if ($action == 'classify') {
                 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                 $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+        }
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
                 $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

dolibarr/htdocs/don/document.php

Indentation +51 added lines, -51 removed lines

@@ -85,8 +85,8 @@ 
 
 if ($action == 'classin' && $user->rights->don->creer)
 {
-	$object->fetch($id);
-	$object->setProject($projectid);
+    $object->fetch($id);
+    $object->setProject($projectid);
 }
 
 /*
@@ -103,77 +103,77 @@ 
 
 if ($object->id)
 {
-	$object->fetch_thirdparty();
+    $object->fetch_thirdparty();
 
-	$head=donation_prepare_head($object);
+    $head=donation_prepare_head($object);
 
-	dol_fiche_head($head, 'documents',  $langs->trans("Donation"), -1, 'generic');
+    dol_fiche_head($head, 'documents',  $langs->trans("Donation"), -1, 'generic');
 
 
-	// Build file list
-	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
-	$totalsize=0;
-	foreach($filearray as $key => $file)
-	{
-		$totalsize+=$file['size'];
-	}
+    // Build file list
+    $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview.*\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
+    $totalsize=0;
+    foreach($filearray as $key => $file)
+    {
+        $totalsize+=$file['size'];
+    }
 
     // $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=don&method=list' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.=$langs->trans('Project') . ' ';
-	    if ($user->rights->don->creer)
-	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+    $morehtmlref='<div class="refidno">';
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.=$langs->trans('Project') . ' ';
+        if ($user->rights->don->creer)
+        {
+            if ($action != 'classify')
+                // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+                if ($action == 'classify') {
+                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
+                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 // $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
                 $morehtmlref .= $proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
 
 
-	dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
+    dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
     print '<table class="border" width="100%">';
 
-	// Ref
-	/*
+    // Ref
+    /*
 	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
 	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
 	print '</td></tr>';
     */
 
-	// Societe
-	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
+    // Societe
+    //print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
 
     print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
     print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize,1,1).'</td></tr>';
@@ -193,7 +193,7 @@ 
 }
 else
 {
-	print $langs->trans("ErrorUnknown");
+    print $langs->trans("ErrorUnknown");
 }
 
 llxFooter();

Braces +13 added lines, -7 removed lines

@@ -54,7 +54,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 
@@ -66,8 +68,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 
 $object = new Don($db);
@@ -129,11 +135,12 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 	            if ($action == 'classify') {
 	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+	        }
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
 	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
@@ -190,8 +197,7 @@ 
     $permtoedit = $user->rights->don->creer;
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	print $langs->trans("ErrorUnknown");
 }

dolibarr/htdocs/comm/propal/contact.php

Indentation +102 added lines, -102 removed lines

@@ -52,27 +52,27 @@ 
 // Load object
 if ($id > 0 || ! empty($ref))
 {
-	$ret=$object->fetch($id, $ref);
-	if ($ret == 0)
-	{
-		$langs->load("errors");
-		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
-		$error++;
-	}
-	else if ($ret < 0)
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-		$error++;
-	}
+    $ret=$object->fetch($id, $ref);
+    if ($ret == 0)
+    {
+        $langs->load("errors");
+        setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
+        $error++;
+    }
+    else if ($ret < 0)
+    {
+        setEventMessages($object->error, $object->errors, 'errors');
+        $error++;
+    }
 }
 if (! $error)
 {
-	$object->fetch_thirdparty();
+    $object->fetch_thirdparty();
 }
 else
 {
-	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
-	exit;
+    header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
+    exit;
 }
 
 
@@ -84,52 +84,52 @@ 
 {
     if ($object->id > 0)
     {
-    	$contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
-  		$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+        $contactid = (GETPOST('userid','int') ? GETPOST('userid','int') : GETPOST('contactid','int'));
+            $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
     }
 
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-	}
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+        {
+            $langs->load("errors");
+            setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+        }
+    }
 }
 
 // Toggle the status of a contact
 else if ($action == 'swapstatut' && $user->rights->propale->creer)
 {
-	if ($object->id > 0)
-	{
-	    $result=$object->swapContactStatus(GETPOST('ligne'));
-	}
+    if ($object->id > 0)
+    {
+        $result=$object->swapContactStatus(GETPOST('ligne'));
+    }
 }
 
 // Deletes a contact
 else if ($action == 'deletecontact' && $user->rights->propale->creer)
 {
-	$result = $object->delete_contact($lineid);
-
-	if ($result >= 0)
-	{
-		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
-		exit;
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    $result = $object->delete_contact($lineid);
+
+    if ($result >= 0)
+    {
+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+        exit;
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 /*
 else if ($action == 'setaddress' && $user->rights->propale->creer)
@@ -152,68 +152,68 @@ 
 if ($object->id > 0)
 {
     $head = propal_prepare_head($object);
-	dol_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
+    dol_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
 
 
-	// Proposal card
+    // Proposal card
 
     //$linkback = '<a href="' . DOL_URL_ROOT . '/comm/propal/list.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
     $linkback = '<a href="' . BASE_URI . '?controller=comm/propal&method=list.php&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->propal->creer)
-	    {
-	        if ($action != 'classify')
-	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
-	            $morehtmlref.=' : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+    $morehtmlref='<div class="refidno">';
+    // Ref customer
+    $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+    $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+    // Thirdparty
+    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1,'customer');
+    // Project
+    if (! empty($conf->projet->enabled))
+    {
+        $langs->load("projects");
+        $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+        if ($user->rights->propal->creer)
+        {
+            if ($action != 'classify')
+                //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+                $morehtmlref.=' : ';
+                if ($action == 'classify') {
+                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
+                    $morehtmlref.='<input type="hidden" name="action" value="classin">';
+                    $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+                    $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+                    $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+                    $morehtmlref.='</form>';
+                } else {
+                    $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+                }
+        } else {
+            if (! empty($object->fk_project)) {
+                $proj = new Project($db);
+                $proj->fetch($object->fk_project);
                 //$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
                 $morehtmlref .= '<a href="' . BASE_URI . '?controller=projet&method=card&id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
-	}
-	$morehtmlref.='</div>';
-
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
-
-	dol_fiche_end();
-
-
-	// Contacts lines (modules that overwrite templates must declare this into descriptor)
-	$dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
-	foreach($dirtpls as $reldir)
-	{
-		$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
-	}
+                $morehtmlref.=$proj->ref;
+                $morehtmlref.='</a>';
+            } else {
+                $morehtmlref.='';
+            }
+        }
+    }
+    $morehtmlref.='</div>';
+
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+    dol_fiche_end();
+
+
+    // Contacts lines (modules that overwrite templates must declare this into descriptor)
+    $dirtpls=array_merge($conf->modules_parts['tpl'],array('/core/tpl'));
+    foreach($dirtpls as $reldir)
+    {
+        $res=@include dol_buildpath($reldir.'/contacts.tpl.php');
+        if ($res) break;
+    }
 }
 
 // End of page

Braces +14 added lines, -14 removed lines

@@ -44,7 +44,9 @@ 
 $action=GETPOST('action','alpha');
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
@@ -58,8 +60,7 @@ 
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
 		$error++;
-	}
-	else if ($ret < 0)
+	} else if ($ret < 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$error++;
@@ -68,8 +69,7 @@ 
 if (! $error)
 {
 	$object->fetch_thirdparty();
-}
-else
+} else
 {
 	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
 	exit;
@@ -92,15 +92,13 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
 		{
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -125,8 +123,7 @@ 
 	{
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -173,9 +170,10 @@ 
 	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 	    if ($user->rights->propal->creer)
 	    {
-	        if ($action != 'classify')
-	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+	        if ($action != 'classify') {
+	        	            //$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 	            $morehtmlref.=' : ';
+	        }
 	            if ($action == 'classify') {
 	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
@@ -212,7 +210,9 @@ 
 	foreach($dirtpls as $reldir)
 	{
 		$res=@include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+		    break;
+		}
 	}
 }
 

dolibarr/htdocs/admin/defaultvalues.php

Braces +65 added lines, -24 removed lines

@@ -38,7 +38,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'products', 'admin', 'sms', 'other', 'errors'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 $id = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'alpha');
@@ -55,8 +57,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'page,param';
-if (!$sortorder) $sortorder = 'ASC';
+if (!$sortfield) {
+    $sortfield = 'page,param';
+}
+if (!$sortorder) {
+    $sortorder = 'ASC';
+}
 
 $defaulturl = GETPOST('defaulturl');
 $defaultkey = GETPOST('defaultkey', 'alpha');
@@ -86,14 +92,18 @@ 
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+    // All tests are required to be compatible with all browsers
 {
     $defaulturl = '';
+}
     $defaultkey = '';
     $defaultvalue = '';
     $toselect = '';
@@ -101,9 +111,12 @@ 
 }
 
 if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES') {
-    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
-}
+    if (GETPOST('value')) {
+        dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
+    } else {
+        dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
+    }
+    }
 
 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify')) {
     $error = 0;
@@ -199,16 +212,30 @@ 
 print $langs->trans("DefaultValuesDesc") . "<br>\n";
 print "<br>\n";
 
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage=' . $contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit=' . $limit;
-if ($optioncss != '') $param .= '&optioncss=' . $optioncss;
-if ($defaulturl) $param .= '&defaulturl=' . urlencode($defaulturl);
-if ($defaultkey) $param .= '&defaultkey=' . urlencode($defaultkey);
-if ($defaultvalue) $param .= '&defaultvalue=' . urlencode($defaultvalue);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param .= '&contextpage=' . $contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param .= '&limit=' . $limit;
+}
+if ($optioncss != '') {
+    $param .= '&optioncss=' . $optioncss;
+}
+if ($defaulturl) {
+    $param .= '&defaulturl=' . urlencode($defaulturl);
+}
+if ($defaultkey) {
+    $param .= '&defaultkey=' . urlencode($defaultkey);
+}
+if ($defaultvalue) {
+    $param .= '&defaultvalue=' . urlencode($defaultvalue);
+}
 
 
 print '<form action="' . $_SERVER["PHP_SELF"] . ((empty($user->entity) && $debug) ? '?debug=1' : '') . '" method="POST">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+if ($optioncss != '') {
+    print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+}
 print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -269,8 +296,11 @@ 
     print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
 // Entity
-if (!empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
-else print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($conf->multicompany->enabled) && !$user->entity) {
+    print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
+} else {
+    print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+}
 // Actions
 print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 print "</tr>\n";
@@ -306,7 +336,9 @@ 
 }
 print '<td align="center">';
 $disabled = '';
-if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) $disabled = ' disabled="disabled"';
+if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
+    $disabled = ' disabled="disabled"';
+}
 print '<input type="submit" class="button"' . $disabled . ' value="' . $langs->trans("Add") . '" name="add">';
 print "</td>\n";
 print '</tr>';
@@ -335,14 +367,20 @@ 
 
         // Page
         print '<td>';
-        if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->page;
-        else print '<input type="text" name="urlpage" value="' . dol_escape_htmltag($obj->page) . '">';
+        if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) {
+            print $obj->page;
+        } else {
+            print '<input type="text" name="urlpage" value="' . dol_escape_htmltag($obj->page) . '">';
+        }
         print '</td>' . "\n";
 
         // Field
         print '<td>';
-        if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->param;
-        else print '<input type="text" name="key" value="' . dol_escape_htmltag($obj->param) . '">';
+        if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) {
+            print $obj->param;
+        } else {
+            print '<input type="text" name="key" value="' . dol_escape_htmltag($obj->param) . '">';
+        }
         print '</td>' . "\n";
 
         // Value
@@ -353,8 +391,11 @@ 
             print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
             print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
             */
-            if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print $obj->value;
-            else print '<input type="text" name="value" value="' . dol_escape_htmltag($obj->value) . '">';
+            if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) {
+                print $obj->value;
+            } else {
+                print '<input type="text" name="value" value="' . dol_escape_htmltag($obj->value) . '">';
+            }
             print '</td>';
         }