Normalize code

This commit is contained in:
Laurent Destailleur 2012-07-23 10:55:29 +02:00
parent ea93e62e91
commit 7a8224c4d5
10 changed files with 19 additions and 22 deletions

View File

@ -18,10 +18,9 @@
*/ */
/** /**
* \file /marges/admin/commissions.php * \file /htdocs/admin/commissions.php
* \ingroup marges * \ingroup commissions
* \brief Page to setup advanced commissions module * \brief Page to setup advanced commissions module
* \version $Id:$
*/ */
$res=@include("../main.inc.php"); // For root directory $res=@include("../main.inc.php"); // For root directory
@ -39,7 +38,7 @@ accessforbidden();
if ($conf->global->COMMISSION_BASE == "") { if ($conf->global->COMMISSION_BASE == "") {
if ($conf->marges->enabled) if ($conf->marges->enabled)
$conf->global->COMMISSION_BASE = "MARGES"; $conf->global->COMMISSION_BASE = "MARGES";
else else
$conf->global->COMMISSION_BASE = "CA"; $conf->global->COMMISSION_BASE = "CA";
} }
@ -80,11 +79,12 @@ if (isset($_POST['serviceCommissionRate']))
} }
} }
/* /*
* View * View
*/ */
llxHeader('',$langs->trans("commissionsSetup")); llxHeader('',$langs->trans("CommissionsSetup"));
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>'; $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
@ -93,7 +93,7 @@ print_fiche_titre($langs->trans("commissionsSetup"),$linkback,'setup');
$head = commissions_admin_prepare_head($adh); $head = commissions_admin_prepare_head($adh);
dol_fiche_head($head, 'parameters', $langs->trans("commissions"), 0, 'company'); dol_fiche_head($head, 'parameters', $langs->trans("Commissions"), 0, 'commissions');
print "<br>"; print "<br>";
@ -123,7 +123,7 @@ print ' />';
print $langs->trans("CommissionBasedOnCA"); print $langs->trans("CommissionBasedOnCA");
print '<br/>'; print '<br/>';
print '<input type="radio" name="commissionBase" value="MARGES" '; print '<input type="radio" name="commissionBase" value="MARGES" ';
if (!$conf->marges->enabled) if (!$conf->marges->enabled)
print 'disabled'; print 'disabled';
elseif ($conf->global->COMMISSION_BASE == "MARGES") elseif ($conf->global->COMMISSION_BASE == "MARGES")
print 'checked'; print 'checked';

View File

@ -102,7 +102,7 @@ print_fiche_titre($langs->trans("margesSetup"),$linkback,'setup');
$head = marges_admin_prepare_head(); $head = marges_admin_prepare_head();
dol_fiche_head($head, 'parameters', $langs->trans("marges"), 0, 'company'); dol_fiche_head($head, 'parameters', $langs->trans("marges"), 0, 'marges');
print "<br>"; print "<br>";

View File

@ -33,7 +33,7 @@ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
/** /**
* Classe de description et activation du module Commande * Class to describe module customer orders
*/ */
class modCommande extends DolibarrModules class modCommande extends DolibarrModules
{ {

View File

@ -17,21 +17,19 @@
*/ */
/** \defgroup mymodule Module MyModule /** \defgroup mymodule Module MyModule
* \brief Example of a module descriptor. * \brief Module to manage commissions
* Such a file must be copied into htdocs/includes/module directory.
*/ */
/** /**
* \file htdocs/includes/modules/modMyModule.class.php * \file htdocs/includes/modules/modCommissions.class.php
* \ingroup mymodule * \ingroup commissions
* \brief Description and activation file for module MyModule * \brief Description and activation file for module Commissions
* \version $Id: modMyModule.class.php,v 1.26 2008/12/15 18:27:00 eldy Exp $
*/ */
include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
/** \class modMyModule /**
* \brief Description and activation class for module MyModule * Class to describe modude Commisions
*/ */
class modCommissions extends DolibarrModules class modCommissions extends DolibarrModules
{ {
@ -56,16 +54,16 @@ class modCommissions extends DolibarrModules
// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
$this->name = mb_ereg_replace('^mod','',get_class($this), "i"); $this->name = mb_ereg_replace('^mod','',get_class($this), "i");
// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module) // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
$this->description = "Gestion des commissions"; $this->description = "Commissions management";
// Possible values for version are: 'development', 'experimental', 'dolibarr' or version // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
$this->version = '1.0'; $this->version = 'dolibarr';
// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
// Where to store the module in setup page (0=common,1=interface,2=other) // Where to store the module in setup page (0=common,1=interface,2=other)
$this->special = 0; $this->special = 0;
// Name of png file (without png) used for this module. // Name of png file (without png) used for this module.
// Png file must be in theme/yourtheme/img directory under name object_pictovalue.png. // Png file must be in theme/yourtheme/img directory under name object_pictovalue.png.
$this->picto='commissions@commissions'; $this->picto='commissions';
// Data directories to create when module is enabled. // Data directories to create when module is enabled.
$this->dirs = array(); $this->dirs = array();

View File

@ -25,8 +25,7 @@ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php");
/** /**
* \class modMargin * Class to describe module Margin
* \brief Description and activation class for module Margin
*/ */
class modMargin extends DolibarrModules class modMargin extends DolibarrModules
{ {

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B