From e68b6de735049c0832eb1c676c6d26c5d012366a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 4 Nov 2008 17:26:33 +0000 Subject: [PATCH] Doxygen --- htdocs/admin/compta.php | 38 +++++++++++++++-------------- htdocs/admin/taxes.php | 3 +++ htdocs/compta/tva/clients.php | 1 + htdocs/compta/tva/quadri_detail.php | 1 + 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php index 9d3e8de3faf..68ac2429f56 100644 --- a/htdocs/admin/compta.php +++ b/htdocs/admin/compta.php @@ -18,11 +18,11 @@ */ /** - \file htdocs/admin/compta.php - \ingroup tax - \brief Page de configuration du module tax - \version $Id$ -*/ + \file htdocs/admin/compta.php + \ingroup tax + \brief Page de configuration du module tax + \version $Id$ + */ require('./pre.inc.php'); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); @@ -31,7 +31,7 @@ $langs->load('admin'); $langs->load('compta'); if (!$user->admin) - accessforbidden(); +accessforbidden(); llxHeader(); @@ -41,8 +41,10 @@ $compta_mode = defined('COMPTA_MODE')?COMPTA_MODE:'RECETTES-DEPENSES'; if ($_POST['action'] == 'setcomptamode') { - $compta_mode = $_POST['compta_mode']; - if (! dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode)) { print $db->error(); } + $compta_mode = $_POST['compta_mode']; + if (! dolibarr_set_const($db, 'COMPTA_MODE', $compta_mode)) { print $db->error(); } + // Note: This setup differs from TAX_MODE. + // TAX_MODE is used with 0=normal, 1=option vat for services is on debit } @@ -54,7 +56,7 @@ if ($_POST['action'] == 'update' || $_POST['action'] == 'add') { if (! dolibarr_set_const($db, $_POST['constname'], $_POST['constvalue'], $typeconst[$_POST['consttype']], 0, isset($_POST['constnote']) ? $_POST['constnote'] : '')); { - print $db->error(); + print $db->error(); } } @@ -63,7 +65,7 @@ if ($_GET['action'] == 'delete') { if (! dolibarr_del_const($db, $_GET['constname'])); { - print $db->error(); + print $db->error(); } } @@ -93,13 +95,13 @@ print ''.nl2br($langs->trans('OptionModeTrueDesc')); // Write info on way to count VAT if ($conf->global->MAIN_MODULE_COMPTABILITE) { -// print "
\n"; -// print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite')); + // print "
\n"; + // print nl2br($langs->trans('OptionModeTrueInfoModuleComptabilite')); } else { -// print "
\n"; -// print nl2br($langs->trans('OptionModeTrueInfoExpert')); + // print "
\n"; + // print nl2br($langs->trans('OptionModeTrueInfoExpert')); } print "\n"; print ' '.$langs->trans('OptionModeVirtual').''; @@ -115,7 +117,7 @@ $sql ="SELECT rowid, name, value, type, note"; $sql.=" FROM llx_const"; $sql.=" WHERE name like 'COMPTA_%' and name not in ('COMPTA_MODE')"; $result = $db->query($sql); -if ($result) +if ($result) { $num = $db->num_rows($result); $i = 0; @@ -140,12 +142,12 @@ if ($result) print ''; print ''; - + // Param print ''.stripslashes(nl2br($obj->note)); print $obj->name; print "\n"; - + // Value print ''; if ($obj->type == 'yesno') @@ -170,7 +172,7 @@ if ($result) $i++; } - + if ($num) { print "\n"; diff --git a/htdocs/admin/taxes.php b/htdocs/admin/taxes.php index 4786b7b0187..6c583b74dbd 100644 --- a/htdocs/admin/taxes.php +++ b/htdocs/admin/taxes.php @@ -34,6 +34,9 @@ $langs->load('taxes'); if (!$user->admin) accessforbidden(); +/* + * View + */ llxHeader(); diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 317af8f7cc1..147299cb044 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -54,6 +54,7 @@ if($min == 0 or $min!=floatval(strval($min))){ } // Define modetax (0 or 1) +// 0=normal, 1=option vat for services is on debit $modetax = $conf->global->TAX_MODE; if ($_GET["modetax"]) $modetax=$_GET["modetax"]; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index d772fe9cb2b..94e94222397 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -54,6 +54,7 @@ if (empty($year)) $q=(! empty($_GET["q"]))?$_GET["q"]:1; // Define modetax (0 or 1) +// 0=normal, 1=option vat for services is on debit $modetax = $conf->global->TAX_MODE; if ($_GET["modetax"]) $modetax=$_GET["modetax"];