From 6482c51858728e0255370ea2663319b578bd04eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Sat, 3 May 2014 12:11:30 +0200
Subject: [PATCH] Improved usability of admin/compta.php page

---
 htdocs/admin/compta.php | 160 +++++++++++++++-------------------------
 1 file changed, 60 insertions(+), 100 deletions(-)

diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 1e5828f55e2..bf829dfcb7a 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@capnetworks.com>
  * Copyright (C) 2011-2013 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2013      Philippe Grand	    <philippe.grand@atoo-net.com>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,43 +37,51 @@ accessforbidden();
 
 $action = GETPOST('action','alpha');
 
+// Other parameters COMPTA_*
+$list = array(
+    'COMPTA_PRODUCT_BUY_ACCOUNT',
+    'COMPTA_PRODUCT_SOLD_ACCOUNT',
+    'COMPTA_SERVICE_BUY_ACCOUNT',
+    'COMPTA_SERVICE_SOLD_ACCOUNT',
+    'COMPTA_VAT_ACCOUNT',
+    'COMPTA_VAT_BUY_ACCOUNT',
+    'COMPTA_ACCOUNT_CUSTOMER',
+    'COMPTA_ACCOUNT_SUPPLIER'
+);
+
 /*
  * Actions
  */
 
 $compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES';
 
-if ($action == 'setcomptamode')
+if ($action == 'update')
 {
-	$compta_mode = GETPOST('compta_mode','alpha');
-	
-	$res = dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode,'chaine',0,'',$conf->entity);
-	
-	if (! $res > 0) $error++;
+    $error = 0;
 
- 	if (! $error)
-    {
-        setEventMessage($langs->trans("SetupSaved"));
-    }
-    else
-    {
-        setEventMessage($langs->trans("Error"),'errors');
+    $compta_mode = GETPOST('compta_mode','alpha');
+
+    if (in_array($compta_mode, array(
+        'RECETTES-DEPENSES',
+        'CREANCES-DETTES'
+    ))) {
+
+        if (!dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode, 'chaine', 0, '', $conf->entity)) {
+            $error++;
+        }
+    } else {
+        $error++;
     }
 
-}
+    foreach ($list as $constname) {
+        $constvalue = GETPOST($constname, 'alpha');
 
-if ($action == 'update' || $action == 'add')
-{
-	$constname = GETPOST('constname','alpha');
-	$constvalue = GETPOST('constvalue','alpha');
-	$consttype = GETPOST('consttype','alpha');
-	$constnote = GETPOST('constnote','alpha');
-	
-	$res = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
-	
-	if (! $res > 0) $error++;
+        if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+            $error++;
+        }
+    }
 
- 	if (! $error)
+    if (! $error)
     {
         setEventMessage($langs->trans("SetupSaved"));
     }
@@ -82,15 +91,6 @@ if ($action == 'update' || $action == 'add')
     }
 }
 
-
-/*if ($action == 'delete')
-{
-	if (! dolibarr_del_const($db, $_GET['constname'],$conf->entity));
-	{
-		print $db->error();
-	}
-}*/
-
 /*
  * View
  */
@@ -104,29 +104,30 @@ print_fiche_titre($langs->trans('ComptaSetup'),$linkback,'setup');
 
 print '<br>';
 
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<input type="hidden" name="action" value="update">';
+
 print '<table class="noborder" width="100%">';
 
 // Cas du parametre COMPTA_MODE
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-print '<input type="hidden" name="action" value="setcomptamode">';
+
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans('OptionMode').'</td><td>'.$langs->trans('Description').'</td>';
-print '<td align="right"><input class="button" type="submit" value="'.$langs->trans('Modify').'"></td>';
 print "</tr>\n";
 print '<tr '.$bc[false].'><td width="200"><input type="radio" name="compta_mode" value="RECETTES-DEPENSES"'.($compta_mode != 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeTrue').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeTrueDesc'));
 // Write info on way to count VAT
-if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
-{
-	//	print "<br>\n";
-	//	print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
-}
-else
-{
-	//	print "<br>\n";
-	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
-}
+//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
+//{
+//	//	print "<br>\n";
+//	//	print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite'));
+//}
+//else
+//{
+//	//	print "<br>\n";
+//	//	print nl2br($langs->trans('OptionModeTrueInfoExpert'));
+//}
 print "</td></tr>\n";
 print '<tr '.$bc[true].'><td width="200"><input type="radio" name="compta_mode" value="CREANCES-DETTES"'.($compta_mode == 'CREANCES-DETTES' ? ' checked' : '').'> '.$langs->trans('OptionModeVirtual').'</td>';
 print '<td colspan="2">'.nl2br($langs->trans('OptionModeVirtualDesc'))."</td></tr>\n";
@@ -136,73 +137,32 @@ print "</table>\n";
 
 print "<br>\n";
 
-// Cas des autres parametres COMPTA_*
-$list=array('COMPTA_PRODUCT_BUY_ACCOUNT','COMPTA_PRODUCT_SOLD_ACCOUNT','COMPTA_SERVICE_BUY_ACCOUNT','COMPTA_SERVICE_SOLD_ACCOUNT',
-'COMPTA_VAT_ACCOUNT','COMPTA_VAT_BUY_ACCOUNT','COMPTA_ACCOUNT_CUSTOMER','COMPTA_ACCOUNT_SUPPLIER'
-);
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td colspan="3">'.$langs->trans('OtherOptions').'</td>';
+print "</tr>\n";
 
-/*$sql = "SELECT rowid, name, value, type, note";
-$sql.= " FROM ".MAIN_DB_PREFIX."const";
-$sql.= " WHERE name LIKE 'COMPTA_%'";
-$sql.= " AND name NOT IN ('COMPTA_MODE')";
-$sql.= " AND entity = ".$conf->entity;
-$result = $db->query($sql);
-if ($result)
-{
-	$num = $db->num_rows($result);
-	$i = 0;
-
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($result);
-		$var=!$var;
-		$list[$obj->name]=$obj->value;
-		$i++;
-	}
-}*/
-
-$num=count($list);
-if ($num)
-{
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="3">'.$langs->trans('OtherOptions').'</td>';
-	print "</tr>\n";
-}
 
 foreach ($list as $key)
 {
 	$var=!$var;
 
-	print '<form action="compta.php" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="consttype" value="string">';
-	print '<input type="hidden" name="constname" value="'.$key.'">';
-	
 	print '<tr '.$bc[$var].' class="value">';
 
 	// Param
 	$libelle = $langs->trans($key); 
-	print '<td>'.$libelle;
-	//print ' ('.$key.')';
-	print "</td>\n";
+	print '<td>'.$libelle.'</td>';
 
 	// Value
 	print '<td>';
-	print '<input type="text" size="20" name="constvalue" value="'.$conf->global->$key.'">';
-	print '</td><td>';
-	print '<input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"> &nbsp; ';
-	print "</td></tr>\n";
-	print '</form>';
-	
-	$i++;
+	print '<input type="text" size="20" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '</td></tr>';
 }
 
-if ($num)
-{
-	print "</table>\n";
-}
+print '</form>';
+print "</table>\n";
+
+print '<br /><br /><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
 
 $db->close();