diff --git a/htdocs/admin/commissions.php b/htdocs/admin/commissions.php index d29788d4d9c..64e618633ac 100644 --- a/htdocs/admin/commissions.php +++ b/htdocs/admin/commissions.php @@ -18,10 +18,9 @@ */ /** - * \file /marges/admin/commissions.php - * \ingroup marges + * \file /htdocs/admin/commissions.php + * \ingroup commissions * \brief Page to setup advanced commissions module - * \version $Id:$ */ $res=@include("../main.inc.php"); // For root directory @@ -39,7 +38,7 @@ accessforbidden(); if ($conf->global->COMMISSION_BASE == "") { if ($conf->marges->enabled) $conf->global->COMMISSION_BASE = "MARGES"; - else + else $conf->global->COMMISSION_BASE = "CA"; } @@ -80,11 +79,12 @@ if (isset($_POST['serviceCommissionRate'])) } } + /* * View */ -llxHeader('',$langs->trans("commissionsSetup")); +llxHeader('',$langs->trans("CommissionsSetup")); $linkback=''.$langs->trans("BackToModuleList").''; @@ -93,7 +93,7 @@ print_fiche_titre($langs->trans("commissionsSetup"),$linkback,'setup'); $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 "
"; @@ -123,7 +123,7 @@ print ' />'; print $langs->trans("CommissionBasedOnCA"); print '
'; print 'marges->enabled) +if (!$conf->marges->enabled) print 'disabled'; elseif ($conf->global->COMMISSION_BASE == "MARGES") print 'checked'; diff --git a/htdocs/admin/margin.php b/htdocs/admin/margin.php index b0c9e5fd510..782d4df55e0 100644 --- a/htdocs/admin/margin.php +++ b/htdocs/admin/margin.php @@ -102,7 +102,7 @@ print_fiche_titre($langs->trans("margesSetup"),$linkback,'setup'); $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 "
"; diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index 60a4cf0f860..a45ed25adc7 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -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 { diff --git a/htdocs/core/modules/modCommissions.class.php b/htdocs/core/modules/modCommissions.class.php index 7744880f9e3..18193953b5c 100644 --- a/htdocs/core/modules/modCommissions.class.php +++ b/htdocs/core/modules/modCommissions.class.php @@ -17,21 +17,19 @@ */ /** \defgroup mymodule Module MyModule - * \brief Example of a module descriptor. - * Such a file must be copied into htdocs/includes/module directory. + * \brief Module to manage commissions */ /** - * \file htdocs/includes/modules/modMyModule.class.php - * \ingroup mymodule - * \brief Description and activation file for module MyModule - * \version $Id: modMyModule.class.php,v 1.26 2008/12/15 18:27:00 eldy Exp $ + * \file htdocs/includes/modules/modCommissions.class.php + * \ingroup commissions + * \brief Description and activation file for module Commissions */ 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 { @@ -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) $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) - $this->description = "Gestion des commissions"; + $this->description = "Commissions management"; // 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) $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); // Where to store the module in setup page (0=common,1=interface,2=other) $this->special = 0; // Name of png file (without png) used for this module. // 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. $this->dirs = array(); diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php index 94118523ed7..a14068f348e 100644 --- a/htdocs/core/modules/modMargin.class.php +++ b/htdocs/core/modules/modMargin.class.php @@ -25,8 +25,7 @@ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); /** - * \class modMargin - * \brief Description and activation class for module Margin + * Class to describe module Margin */ class modMargin extends DolibarrModules { diff --git a/htdocs/theme/amarok/img/object_commissions.png b/htdocs/theme/amarok/img/object_commissions.png new file mode 100644 index 00000000000..39f09967046 Binary files /dev/null and b/htdocs/theme/amarok/img/object_commissions.png differ diff --git a/htdocs/theme/auguria/img/object_commissions.png b/htdocs/theme/auguria/img/object_commissions.png new file mode 100644 index 00000000000..39f09967046 Binary files /dev/null and b/htdocs/theme/auguria/img/object_commissions.png differ diff --git a/htdocs/theme/bureau2crea/img/object_commissions.png b/htdocs/theme/bureau2crea/img/object_commissions.png new file mode 100644 index 00000000000..39f09967046 Binary files /dev/null and b/htdocs/theme/bureau2crea/img/object_commissions.png differ diff --git a/htdocs/theme/cameleo/img/object_commissions.png b/htdocs/theme/cameleo/img/object_commissions.png new file mode 100644 index 00000000000..39f09967046 Binary files /dev/null and b/htdocs/theme/cameleo/img/object_commissions.png differ diff --git a/htdocs/theme/eldy/img/object_commissions.png b/htdocs/theme/eldy/img/object_commissions.png new file mode 100644 index 00000000000..39f09967046 Binary files /dev/null and b/htdocs/theme/eldy/img/object_commissions.png differ