Some cleaning

Dolibarr · Jul 7, 2014 · 9949713 · 9949713
1 parent 83d3af9
commit 9949713
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 30 deletions.
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
@@ -1976,25 +1976,23 @@
 			}
 		}
 	}
-	// Bank Account
-	print '<tr><td class="nowrap">';
-	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	print $langs->trans('BankAccount');
-	print '<td>';
+
+    // Bank Account
+    print '<tr><td class="nowrap">';
+    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+    print $langs->trans('BankAccount');
+    print '<td>';
     if (($action != 'editbankaccount') && $user->rights->propal->creer && ! empty($object->brouillon))
         print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
-	print '</tr></table>';
-	print '</td><td colspan="3">';
-	if ($action == 'editbankaccount')
-	{
-		$form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-	}
-	else
-	{
-		$form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
-	}
-	print "</td>";
-	print '</tr>';
+    print '</tr></table>';
+    print '</td><td colspan="3">';
+    if ($action == 'editbankaccount') {
+        $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
+    } else {
+        $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
+    }
+    print '</td>';
+    print '</tr>';
 
 	// Amount HT
 	print '<tr><td height="10" width="25%">' . $langs->trans('AmountHT') . '</td>';

diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
@@ -2142,15 +2142,12 @@
             print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
         print '</tr></table>';
         print '</td><td colspan="3">';
-        if ($action == 'editbankaccount')
-        {
+        if ($action == 'editbankaccount') {
             $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-        }
-        else
-        {
+        } else {
             $form->form_select_comptes($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
         }
-        print "</td>";
+        print '</td>';
         print '</tr>';
 
 		// Total HT

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
@@ -1087,8 +1087,7 @@ function setDocModel($user, $modelpdf)
      */
     function setBankAccount($fk_account)
     {
-        if (! $this->table_element)
-        {
+        if (! $this->table_element) {
             dol_syslog(get_class($this)."::setBankAccount was called on objet with property table_element not defined",LOG_ERR);
             return -1;
         }
@@ -1099,13 +1098,10 @@ function setBankAccount($fk_account)
         $sql.= " SET fk_account = ".$fk_account;
         $sql.= " WHERE rowid=".$this->id;
 
-        if ($this->db->query($sql))
-        {
+        if ($this->db->query($sql)) {
             $this->fk_account = ($fk_account=='NULL')?null:$fk_account;
             return 1;
-        }
-        else
-        {
+        } else {
             dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
             $this->error=$this->db->error();
             return 0;