diff --git a/htdocs/commissions/admin/commissions.php b/htdocs/commissions/admin/commissions.php
deleted file mode 100644
index 015cab308ff2dc16ed2f398af8bdef25c283df10..0000000000000000000000000000000000000000
--- a/htdocs/commissions/admin/commissions.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file /htdocs/admin/commissions.php
- * \ingroup commissions
- * \brief Page to setup advanced commissions module
- */
-
-include '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/commissions/lib/commissions.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
-require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
-
-$langs->load("admin");
-$langs->load("bills");
-$langs->load("commissions");
-
-if (! $user->admin) accessforbidden();
-
-
-/*
- * Action
- */
-if (GETPOST('commissionBase'))
-{
- if (dolibarr_set_const($db, 'COMMISSION_BASE', GETPOST('commissionBase'), 'string', 0, '', $conf->entity) > 0)
- {
- $conf->global->COMMISSION_BASE = GETPOST('commissionBase');
- setEventMessage($langs->trans("RecordModifiedSuccessfully"));
- }
- else
- {
- dol_print_error($db);
- }
-}
-
-if (GETPOST('productCommissionRate'))
-{
- if (dolibarr_set_const($db, 'PRODUCT_COMMISSION_RATE', GETPOST('productCommissionRate'), 'rate', 0, '', $conf->entity) > 0)
- {
- }
- else
- {
- dol_print_error($db);
- }
-}
-
-if (GETPOST('serviceCommissionRate'))
-{
- if (dolibarr_set_const($db, 'SERVICE_COMMISSION_RATE', GETPOST('serviceCommissionRate'), 'rate', 0, '', $conf->entity) > 0)
- {
- }
- else
- {
- dol_print_error($db);
- }
-}
-
-if (GETPOST('AGENT_CONTACT_TYPE'))
-{
- if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', GETPOST('AGENT_CONTACT_TYPE'), 'chaine', 0, '', $conf->entity) > 0)
- {
- $conf->global->AGENT_CONTACT_TYPE = GETPOST('AGENT_CONTACT_TYPE');
- }
- else
- {
- dol_print_error($db);
- }
-}
-
-/*
- * View
- */
-
-llxHeader('',$langs->trans("CommissionsSetup"));
-
-
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print_fiche_titre($langs->trans("commissionsSetup"),$linkback,'setup');
-
-
-$head = commissions_admin_prepare_head();
-
-dol_fiche_head($head, 'parameters', $langs->trans("Commissions"), 0, 'commissions');
-
-print "<br>";
-
-
-print_fiche_titre($langs->trans("MemberMainOptions"),'','');
-print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Description").'</td>';
-print '<td align="left">'.$langs->trans("Value").'</td>'."\n";
-print '<td align="left">'.$langs->trans("Details").'</td>'."\n";
-print '</tr>';
-
-$var=true;
-$form = new Form($db);
-
-print '<form method="post">';
-
-// COMMISSION BASE (TURNOVER / MARGIN)
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("CommissionBase").'</td>';
-print '<td align="left">';
-print '<input type="radio" name="commissionBase" value="TURNOVER" ';
-if (isset($conf->global->COMMISSION_BASE) && $conf->global->COMMISSION_BASE == "TURNOVER")
- print 'checked';
-print ' />';
-print $langs->trans("CommissionBasedOnTurnover");
-print '<br/>';
-print '<input type="radio" name="commissionBase" value="MARGIN" ';
-if (empty($conf->margin->enabled))
- print 'disabled';
-elseif (isset($conf->global->COMMISSION_BASE) && $conf->global->COMMISSION_BASE == "MARGIN")
- print 'checked';
-print ' />';
-print $langs->trans("CommissionBasedOnMargins");
-print '</td>';
-print '<td>'.$langs->trans('CommissionBaseDetails');
-print '<br/>';
-print $langs->trans('CommissionBasedOnMarginsDetails');
-print '</td>';
-print '</tr>';
-
-// PRODUCT COMMISSION RATE
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("ProductCommissionRate").'</td>';
-print '<td align="left">';
-print '<input type="text" name="productCommissionRate" value="'.(! empty($conf->global->PRODUCT_COMMISSION_RATE)?$conf->global->PRODUCT_COMMISSION_RATE:'').'" size=6 /> %';
-print '</td>';
-print '<td>'.$langs->trans('ProductCommissionRateDetails').'</td>';
-print '</tr>';
-
-// SERVICE COMMISSION RATE
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("ServiceCommissionRate").'</td>';
-print '<td align="left">';
-print '<input type="text" name="serviceCommissionRate" value="'.(! empty($conf->global->SERVICE_COMMISSION_RATE)?$conf->global->SERVICE_COMMISSION_RATE:'').'" size=6 /> %';
-print '</td>';
-print '<td>'.$langs->trans('ServiceCommissionRateDetails').'</td>';
-print '</tr>';
-
-// INTERNAL CONTACT TYPE USED AS COMMERCIAL AGENT
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td>'.$langs->trans("AgentContactType").'</td>';
-print '<td align="left">';
-$formcompany = new FormCompany($db);
-$facture = new Facture($db);
-print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE","internal","code",1);
-print '</td>';
-print '<td>'.$langs->trans('AgentContactTypeDetails').'</td>';
-print '</tr>';
-
-$var=!$var;
-print '<tr '.$bc[$var].'>';
-print '<td align="center" colspan="3">';
-print '<input type="submit" class="button" />';
-print '</td>';
-print '</tr>';
-
-print '</table>';
-
-print '</form>';
-
-dol_fiche_end();
-
-print '<br>';
-
-llxFooter();
-$db->close();
-?>
diff --git a/htdocs/commissions/index.php b/htdocs/commissions/index.php
deleted file mode 100644
index cdc6329d858d02b2ede7899d25f7bb85198312a2..0000000000000000000000000000000000000000
--- a/htdocs/commissions/index.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file htdocs/commissions/index.php
- * \ingroup commissions
- * \brief Page des commissions par agent commercial
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (! empty($conf->margin->enabled))
- require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
-
-$langs->load("companies");
-$langs->load("bills");
-$langs->load("products");
-$langs->load("commissions");
-if (! empty($conf->margin->enabled))
- $langs->load("margins");
-
-// Security check
-$agentid = GETPOST('agentid','int');
-
-$mesg = '';
-
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
-if ($page == -1) { $page = 0; }
-$offset = $conf->liste_limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-
-$startdate=$enddate='';
-
-if (!empty($_POST['startdatemonth']))
- $startdate = date('Y-m-d', dol_mktime(12, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']));
-if (!empty($_POST['enddatemonth']))
- $enddate = date('Y-m-d', dol_mktime(12, 0, 0, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']));
-
-/*
- * View
- */
-
-$userstatic = new User($db);
-$companystatic = new Societe($db);
-$invoicestatic=new Facture($db);
-
-$form = new Form($db);
-
-llxHeader('',$langs->trans("Commissions"));
-
-$text=$langs->trans("Commissions");
-print_fiche_titre($text);
-
-print '<form method="post" name="sel">';
-print '<table class="border" width="100%">';
-
-if ($agentid > 0) {
-
- print '<tr><td width="20%">'.$langs->trans('CommercialAgent').'</td>';
- print '<td colspan="4">';
- print $form->select_dolusers($agentid,'agentid',1,'',0,'','');
- print '</td></tr>';
-
- if (! $sortorder) $sortorder="ASC";
- if (! $sortfield) $sortfield="s.nom";
-}
-else {
- print '<tr><td width="20%">'.$langs->trans('CommercialAgent').'</td>';
- print '<td colspan="4">';
- print $form->select_dolusers('','agentid',1,'',0,'','');
- print '</td></tr>';
- if (! $sortorder) $sortorder="ASC";
- if (! $sortfield) $sortfield="u.login";
-}
-
-// Start date
-print '<td>'.$langs->trans('StartDate').'</td>';
-print '<td width="20%">';
-$form->select_date($startdate,'startdate','','',1,"sel",1,1);
-print '</td>';
-print '<td width="20%">'.$langs->trans('EndDate').'</td>';
-print '<td width="20%">';
-$form->select_date($enddate,'enddate','','',1,"sel",1,1);
-print '</td>';
-print '<td style="text-align: center;">';
-print '<input type="submit" value="'.$langs->trans('Launch').'" />';
-print '</td></tr>';
-
-// Include unpayed invoices
-print '<tr><td>'.$langs->trans("IncludeUnpayedInvoices").'</td><td colspan="4">';
-print '<input id="selIncluded" type="checkbox" name="unpayed" ';
-if (GETPOST('unpayed') == 'on')
- print 'checked ';
-print '/>';
-print '</td></tr>';
-
-
-// Total Margin
-if ($conf->global->COMMISSION_BASE == "MARGIN") {
- print '<tr style="font-weight: bold"><td>'.$langs->trans("TotalMargin").'</td><td colspan="4">';
- print '<span id="totalBase"></span>'; // set by jquery (see below)
- print '</td></tr>';
-}
-elseif ($conf->global->COMMISSION_BASE == "TURNOVER") {
- print '<tr style="font-weight: bold"><td>'.$langs->trans("TurnoverTotal").'</td><td colspan="4">';
- print '<span id="totalBase"></span>'; // set by jquery (see below)
- print '</td></tr>';
-}
-
-// Total Commission
-print '<tr style="font-weight: bold"><td>'.$langs->trans("TotalCommission").'</td><td colspan="4">';
-print '<span id="totalCommission"></span>'; // set by jquery (see below)
-print '</td></tr>';
-
-print "</table>";
-print '</form>';
-
-$sql = "SELECT s.nom, s.rowid as socid, s.code_client, s.client, sc.fk_user as agent,";
-$sql.= " u.login,";
-if ($conf->global->COMMISSION_BASE == "MARGIN") {
- $sql.= " sum(case d.product_type when 1 then 0 else (((d.subprice * (1 - d.remise_percent / 100)) - d.buy_price_ht) * d.qty) end) as productBase," ;
- $sql.= " sum(case d.product_type when 1 then (((d.subprice * (1 - d.remise_percent / 100)) - d.buy_price_ht) * d.qty) else 0 end) as serviceBase" ;
-}
-elseif ($conf->global->COMMISSION_BASE == "TURNOVER") {
- $sql.= " sum(case d.product_type when 1 then 0 else (((d.subprice * (1 - d.remise_percent / 100))) * d.qty) end) as productBase," ;
- $sql.= " sum(case d.product_type when 1 then (((d.subprice * (1 - d.remise_percent / 100))) * d.qty) else 0 end) as serviceBase" ;
-}
-$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql.= ", ".MAIN_DB_PREFIX."facture as f";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact e ON e.element_id = f.rowid and e.statut = 4 and e.fk_c_type_contact = ".(empty($conf->global->AGENT_CONTACT_TYPE)?-1:$conf->global->AGENT_CONTACT_TYPE);
-$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
-$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql.= ", ".MAIN_DB_PREFIX."user as u";
-$sql.= " WHERE f.fk_soc = s.rowid";
-$sql.= " AND sc.fk_soc = f.fk_soc";
-if (! empty($conf->global->AGENT_CONTACT_TYPE))
- $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = u.rowid) OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = u.rowid))";
-else
- $sql .= " AND sc.fk_user = u.rowid";
-if (GETPOST('unpayed') == 'on')
- $sql.= " AND f.fk_statut > 0";
-else
- $sql.= " AND f.fk_statut > 1";
-$sql.= " AND s.entity = ".$conf->entity;
-$sql.= " AND d.fk_facture = f.rowid";
-if ($agentid > 0) {
- if (! empty($conf->global->AGENT_CONTACT_TYPE))
- $sql.= " AND ((e.fk_socpeople IS NULL AND sc.fk_user = ".$agentid.") OR (e.fk_socpeople IS NOT NULL AND e.fk_socpeople = ".$agentid."))";
- else
- $sql .= " AND sc.fk_user = ".$agentid;
-}
-if (!empty($startdate))
- $sql.= " AND f.datef >= '".$startdate."'";
-if (!empty($enddate))
- $sql.= " AND f.datef <= '".$enddate."'";
-if ($conf->global->COMMISSION_BASE == "MARGIN")
- $sql .= " AND d.buy_price_ht IS NOT NULL";
-if (($conf->global->COMMISSION_BASE == "MARGIN") && isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)
- $sql .= " AND d.buy_price_ht <> 0";
-if ($agentid > 0)
- $sql.= " GROUP BY s.rowid";
-else
- $sql.= " GROUP BY u.rowid";
-$sql.= " ORDER BY $sortfield $sortorder ";
-//$sql.= $db->plimit($conf->liste_limit +1, $offset);
-
-$result = $db->query($sql);
-if ($result)
-{
- $num = $db->num_rows($result);
-
- print '<br>';
- print_barre_liste($langs->trans("CommissionDetails"),$page,$_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num,0,'');
-
- $i = 0;
- print "<table class=\"noborder\" width=\"100%\">";
-
- print '<tr class="liste_titre">';
- if ($agentid > 0)
- print_liste_field_titre($langs->trans("Customer"),$_SERVER["PHP_SELF"],"s.nom","","&agentid=".$agentid,'align="center"',$sortfield,$sortorder);
- else
- print_liste_field_titre($langs->trans("CommercialAgent"),$_SERVER["PHP_SELF"],"u.login","","&agentid=".$agentid,'align="center"',$sortfield,$sortorder);
-
- // product commission
- if ($conf->global->COMMISSION_BASE == "MARGIN")
- print_liste_field_titre($langs->trans("ProductMargin"),$_SERVER["PHP_SELF"],"productBase","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
- elseif ($conf->global->COMMISSION_BASE == "TURNOVER")
- print_liste_field_titre($langs->trans("ProductTurnover"),$_SERVER["PHP_SELF"],"productBase","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-
- print_liste_field_titre($langs->trans("CommissionRate"),$_SERVER["PHP_SELF"],"","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("ProductCommission"),$_SERVER["PHP_SELF"],"","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-
- // service commission
- if ($conf->global->COMMISSION_BASE == "MARGIN")
- print_liste_field_titre($langs->trans("ServiceMargin"),$_SERVER["PHP_SELF"],"serviceBase","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
- elseif ($conf->global->COMMISSION_BASE == "TURNOVER")
- print_liste_field_titre($langs->trans("ServiceTurnover"),$_SERVER["PHP_SELF"],"serviceBase","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-
- print_liste_field_titre($langs->trans("CommissionRate"),$_SERVER["PHP_SELF"],"","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("ServiceCommission"),$_SERVER["PHP_SELF"],"","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-
- // total commission
- print_liste_field_titre($langs->trans("TotalCommission"),$_SERVER["PHP_SELF"],"","","&agentid=".$agentid,'align="right"',$sortfield,$sortorder);
-
- print "</tr>\n";
-
- $cumul_base_produit = 0;
- $cumul_base_service = 0;
- $cumul_commission_produit = 0;
- $cumul_commission_service = 0;
- $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
- if ($num > 0)
- {
- $var=True;
- while ($i < $num && $i < $conf->liste_limit)
- {
- $objp = $db->fetch_object($result);
-
- $var=!$var;
-
- print "<tr $bc[$var]>";
- if ($agentid > 0) {
- $companystatic->id=$objp->socid;
- $companystatic->nom=$objp->nom;
- $companystatic->client=$objp->client;
- print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
- }
- else {
- $userstatic->id=$objp->agent;
- $userstatic->login=$objp->login;
- print "<td>".$userstatic->getLoginUrl(1)."</td>\n";
- }
-
- // product commission
- $productCommissionRate=(! empty($conf->global->PRODUCT_COMMISSION_RATE)?$conf->global->PRODUCT_COMMISSION_RATE:0);
- $productBase=(! empty($objp->productBase)?$objp->productBase:0);
- $productCommission = (! empty($productBase)?($productCommissionRate * $productBase / 100):0);
- print "<td align=\"right\">".price($productBase)."</td>\n";
- print "<td align=\"right\">".price($productCommissionRate)."</td>\n";
- print "<td align=\"right\">".price($productCommission)."</td>\n";
-
- // service commission
- $serviceCommissionRate=(! empty($conf->global->SERVICE_COMMISSION_RATE)?$conf->global->SERVICE_COMMISSION_RATE:0);
- $serviceBase=(! empty($objp->serviceBase)?$objp->serviceBase:0);
- $serviceCommission = (! empty($serviceBase)?($serviceCommissionRate * $serviceBase / 100):0);
- print "<td align=\"right\">".price($serviceBase)."</td>\n";
- print "<td align=\"right\">".price($serviceCommissionRate)."</td>\n";
- print "<td align=\"right\">".price($serviceCommission)."</td>\n";
-
- // total commission
- print "<td align=\"right\">".price($productCommission + $serviceCommission)."</td>\n";
- print "</tr>\n";
-
- $i++;
-
- $cumul_base_produit += round($productBase, $rounding);
- $cumul_base_service += round($serviceBase, $rounding);
- $cumul_commission_produit += round($productCommission, $rounding);
- $cumul_commission_service += round($serviceCommission, $rounding);
- }
- }
-
- // affichage totaux commission
- $var=!$var;
- print '<tr '.$bc[$var].' style="border-top: 1px solid #ccc; font-weight: bold">';
- print '<td>';
- print $langs->trans('Total');
- print "</td>";
- // product commission
- print "<td align=\"right\">".price($cumul_base_produit)."</td>\n";
- print "<td align=\"right\">".price((! empty($conf->global->PRODUCT_COMMISSION_RATE)?$conf->global->PRODUCT_COMMISSION_RATE:0))."</td>\n";
- print "<td align=\"right\">".price($cumul_commission_produit)."</td>\n";
- // service commission
- print "<td align=\"right\">".price($cumul_base_service)."</td>\n";
- print "<td align=\"right\">".price((! empty($conf->global->SERVICE_COMMISSION_RATE)?$conf->global->SERVICE_COMMISSION_RATE:0))."</td>\n";
- print "<td align=\"right\">".price($cumul_commission_service)."</td>\n";
- // total commission
- print "<td align=\"right\">".price($cumul_commission_produit + $cumul_commission_service)."</td>\n";
-
- print "</tr>\n";
-
- print "</td>";
- print "</table>";
-}
-else
-{
- dol_print_error($db);
-}
-$db->free($result);
-
-
-llxFooter();
-$db->close();
-?>
-<script type="text/javascript">
-$(document).ready(function() {
-
- $("#agentid").change(function() {
- $("div.fiche form").submit();
- });
-
- $("#selIncluded").change(function() {
- $("div.fiche form").submit();
- });
-
- $("#totalBase").html("<?php echo price($cumul_base_produit + $cumul_base_service); ?>");
- $("#totalCommission").html("<?php echo price($cumul_commission_produit + $cumul_commission_service); ?>");
-
-});
-</script>
\ No newline at end of file
diff --git a/htdocs/commissions/lib/commissions.lib.php b/htdocs/commissions/lib/commissions.lib.php
deleted file mode 100644
index aa87720968c7c7253916bfeed9a590e069e6b396..0000000000000000000000000000000000000000
--- a/htdocs/commissions/lib/commissions.lib.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file /htdocs/commissions/lib/commissions.lib.php
- * \ingroup commissions
- * \brief Library for common commissions functions
- */
-
-/**
- * Define head array for tabs of marges tools setup pages
- *
- * @return Array of head
- */
-function commissions_admin_prepare_head()
-{
- global $langs, $conf;
-
- $h = 0;
- $head = array();
-
- $head[$h][0] = DOL_URL_ROOT.'/commissions/admin/commissions.php';
- $head[$h][1] = $langs->trans("Parameters");
- $head[$h][2] = 'parameters';
- $h++;
-
- // Show more tabs from modules
- // Entries must be declared in modules descriptor with line
- // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
- // $this->tabs = array('entity:-tabname); to remove a tab
- complete_head_from_modules($conf,$langs,'',$head,$h,'commissionsadmin');
-
- complete_head_from_modules($conf,$langs,'',$head,$h,'commissionsadmin','remove');
-
- return $head;
-}
-
-?>
diff --git a/htdocs/core/modules/modCommissions.class.php b/htdocs/core/modules/modCommissions.class.php
deleted file mode 100644
index 64908f5248c1ca381f979959da2a1d4866055b04..0000000000000000000000000000000000000000
--- a/htdocs/core/modules/modCommissions.class.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/* Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
- * Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \defgroup commissions Module commissions
- * \brief Module commissions
- * \file htdocs/core/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 to describe modude Commisions
- */
-class modCommissions extends DolibarrModules
-{
- /**
- * Constructor
- *
- * @param DoliDB $db Database handler
- */
- function __construct($db)
- {
- $this->db = $db;
-
- // Id for module (must be unique).
- // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
- $this->numero = 60000;
- // Key text used to identify module (for permissions, menus, etc...)
- $this->rights_class = 'Commissions';
-
- // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
- // It is used to group modules in module setup page
- $this->family = "financial";
- // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
- $this->name = preg_replace('/^mod/i','',get_class($this));
- // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
- $this->description = "Commissions management";
- // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
- $this->version = 'experimental';
- // 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 = 2;
- // 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';
-
- // Data directories to create when module is enabled.
- $this->dirs = array();
-
- // Config pages. Put here list of php page names stored in admmin directory used to setup module.
- $this->config_page_url = array("commissions.php@commissions");
-
- // Dependencies
- $this->depends = array("modFacture", "modMargin"); // List of modules id that must be enabled if this module is enabled
- $this->requiredby = array(); // List of modules id to disable if this one is disabled
- $this->phpmin = array(5,1); // Minimum version of PHP required by module
- $this->need_dolibarr_version = array(3,2); // Minimum version of Dolibarr required by module
- $this->langfiles = array("commissions");
-
- // Constants
- $this->const = array(0=>array('COMMISSION_BASE',"chaine","TURNOVER",'Default commission base',0)); // List of particular constants to add when module is enabled
-
- // New pages on tabs
- $this->tabs = array();
-
- // Boxes
- $this->boxes = array(); // List of boxes
- $r=0;
-
- // Permissions
- $this->rights = array(); // Permission array used by this module
- $r=0;
-
- // Add here list of permission defined by an id, a label, a boolean and two constant strings.
- // Example:
- // $this->rights[$r][0] = 2000; // Permission id (must not be already used)
- // $this->rights[$r][1] = 'Permision label'; // Permission label
- // $this->rights[$r][3] = 1; // Permission by default for new user (0/1)
- // $this->rights[$r][4] = 'level1'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
- // $this->rights[$r][5] = 'level2'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
- // $r++;
-
-
- // Main menu entries
- $this->menu = array(); // List of menus to add
- $r = 0;
-
- // left menu entry
- $this->menu[$r]=array(
- 'fk_menu'=>'fk_mainmenu=accountancy', // Put 0 if this is a top menu
- 'type'=>'left', // This is a Top menu entry
- 'titre'=>'Commissions',
- 'mainmenu'=>'accountancy',
- 'leftmenu'=>'commissions', // Use 1 if you also want to add left menu entries using this descriptor. Use 0 if left menu entries are defined in a file pre.inc.php (old school).
- 'url'=>'/commissions/index.php',
- 'langs'=>'commissions', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>200,
- 'enabled'=>'$conf->commissions->enabled', // Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
- 'perms'=>'1', // Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
- $r++;
- }
-
- /**
- * Function called when module is enabled.
- * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
- * It also creates data directories.
- *
- * @return int 1 if OK, 0 if KO
- */
- function init()
- {
- $sql = array();
-
- $result=$this->load_tables();
-
- return $this->_init($sql);
- }
-
- /**
- * Function called when module is disabled.
- * Remove from database constants, boxes and permissions from Dolibarr database.
- * Data directories are not deleted.
- *
- * @return int 1 if OK, 0 if KO
- */
- function remove()
- {
- $sql = array();
-
- return $this->_remove($sql);
- }
-
-
- /**
- * Create tables and keys required by module
- * Files mymodule.sql and mymodule.key.sql with create table and create keys
- * commands must be stored in directory /mymodule/sql/
- * This function is called by this->init.
- *
- * @return int <=0 if KO, >0 if OK
- */
- function load_tables()
- {
- return;
- }
-}
-
-?>
diff --git a/htdocs/langs/ca_ES/commissions.lang b/htdocs/langs/ca_ES/commissions.lang
deleted file mode 100644
index da97a4066f2dc6f99e2ce72c17347515c49fed12..0000000000000000000000000000000000000000
--- a/htdocs/langs/ca_ES/commissions.lang
+++ /dev/null
@@ -1,41 +0,0 @@
-# Dolibarr language file - ca_ES - commissions
-CHARSET=UTF-8
-
-Module60000Desc=Gestió de comissions
-commissionsSetup=Configuració de la gestió de comissions
-
-ProductCommissionRate=Taxa de comissió sobre els productes
-ServiceCommissionRate=Taxa de comissió sobre els serveis
-
-ProductCommissionRateDetails=Taxa usada per calcular les comissions sobre les vendes de productes
-ServiceCommissionRateDetails=Taxa usada per calcular les comissions sobre les vendes de serveis
-
-Commissions=Comissions
-CommissionDetails=Detall de comissions
-
-IncludeUnpayedInvoices=Incloure les factures no cobrades
-TotalCommission=Total comissions
-
-ProductMargin=Marge / productes
-ServiceMargin=Marge / serveis
-
-CommissionRate=Taxes comissions
-
-ProductCommission=Comissió / productes
-ServiceCommission=Comissió / serveis
-
-CommissionBase=Base de càlcul de comissions
-CommissionBasedOnTurnover=Comissions calculades sobre el volum de venda
-CommissionBasedOnMargins=Comissions calculades sobre els marges
-CommissionBaseDetails=Estableix el mètode de càlcul de les comissions
-CommissionBasedOnMarginsDetails=El càlcul basat en els marges requereix l'activació del mòdul marges
-
-TurnoverTotal = Volum de vendes sense IVA
-ProductTurnover=Vendes sense IVA / productes
-ServiceTurnover=Vendes sense IVA / serveis
-
-CommercialAgent=Agent comercial
-
-StartDate=Data d'inici
-EndDate=Data de fi
-Launch=Començar
\ No newline at end of file
diff --git a/htdocs/langs/en_US/commissions.lang b/htdocs/langs/en_US/commissions.lang
deleted file mode 100644
index 776f4d0c1a1e1d6f21bdde518c5d776b75ab9e9b..0000000000000000000000000000000000000000
--- a/htdocs/langs/en_US/commissions.lang
+++ /dev/null
@@ -1,44 +0,0 @@
-# Dolibarr language file - fr_FR - commissions
-CHARSET=UTF-8
-
-Module60000Desc=Commissions management
-commissionsSetup=Commissions management setup
-
-ProductCommissionRate=Commission rate on products
-ServiceCommissionRate=Commission rate on services
-
-ProductCommissionRateDetails=Commission rate on product sales
-ServiceCommissionRateDetails=Commission rate on service sales
-
-Commissions=Commissions
-CommissionDetails=Commissions details
-
-IncludeUnpayedInvoices=Include overdue invoices
-TotalCommission=Commissions subtotal
-
-ProductMargin=Margin / products
-ServiceMargin=Margin / services
-
-CommissionRate=Commission rate
-
-ProductCommission=Commission / produics
-ServiceCommission=Commission / services
-
-CommissionBase=Commissions base
-CommissionBasedOnTurnover=Commissions based on turnover
-CommissionBasedOnMargins=Commissions based on margins
-CommissionBaseDetails=Define calculation method for commissions
-CommissionBasedOnMarginsDetails=Commissions based on margins needs margin module activation.
-
-TurnoverTotal = Total turrnover
-ProductTurnover=Product turnover
-ServiceTurnover=Service turnover
-
-CommercialAgent=Commercial agent
-
-StartDate=Start date
-EndDate=End date
-Launch=Start
-
-AgentContactType=Contact type used for commissioning
-AgentContactTypeDetails=Défine what contact type (linked on invoices) will be associated with commercial agents
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/commissions.lang b/htdocs/langs/es_ES/commissions.lang
deleted file mode 100644
index 2077ca5990cc5d5595055fd3884a341b518ecd2b..0000000000000000000000000000000000000000
--- a/htdocs/langs/es_ES/commissions.lang
+++ /dev/null
@@ -1,41 +0,0 @@
-# Dolibarr language file - es_ES - commissions
-CHARSET=UTF-8
-
-Module60000Desc=Gestión de comisiones
-commissionsSetup=Configuración de la gestión de comisiones
-
-ProductCommissionRate=Tasa de comisión sobre los productos
-ServiceCommissionRate=Tasa de comisión sobre los servicios
-
-ProductCommissionRateDetails=Tasa usada para calcular las comisiones sobre las ventas de productos
-ServiceCommissionRateDetails=Tasa usada para calcular las comisiones sobre las ventas de servicios
-
-Commissions=Comisiones
-CommissionDetails=Detalle de comisiones
-
-IncludeUnpayedInvoices=Incluir las facturas no cobradas
-TotalCommission=Total comisiones
-
-ProductMargin=Margen / productos
-ServiceMargin=Margen / servicios
-
-CommissionRate=Tasas comisiones
-
-ProductCommission=Comisión / productos
-ServiceCommission=Comisión / servicios
-
-CommissionBase=Base de cálculo de comisiones
-CommissionBasedOnTurnover=Comisiones calculadas sobre el volumen de venta
-CommissionBasedOnMargins=Comisiones calculadas sobre los márgenes
-CommissionBaseDetails=Establece el método de cálculo de las comisiones
-CommissionBasedOnMarginsDetails=El cálculo basado en los márgenes requiere la activación del módulo márgenes
-
-TurnoverTotal = Volumen de ventas sin IVA
-ProductTurnover=Ventas sin IVA / productos
-ServiceTurnover=Ventas sin IVA / servicios
-
-CommercialAgent=Agente comercial
-
-StartDate=Fecha de inicio
-EndDate=Fecha de fin
-Launch=Comenzar
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/commissions.lang b/htdocs/langs/fr_FR/commissions.lang
deleted file mode 100644
index 5fb83f3232000c4c488a3968daf092809138b419..0000000000000000000000000000000000000000
--- a/htdocs/langs/fr_FR/commissions.lang
+++ /dev/null
@@ -1,44 +0,0 @@
-# Dolibarr language file - fr_FR - commissions
-CHARSET=UTF-8
-
-Module60000Desc=Gestion des commissions
-commissionsSetup=Paramétrage de la gestion des commissions
-
-ProductCommissionRate=Taux de commissionnement sur les produits
-ServiceCommissionRate=Taux de commissionnement sur les services
-
-ProductCommissionRateDetails=Taux utilisé pour calculer les commissions sur les ventes de produits
-ServiceCommissionRateDetails=Taux utilisé pour calculer les commissions sur les ventes de services
-
-Commissions=Commissions
-CommissionDetails=Détail des commissions
-
-IncludeUnpayedInvoices=Inclure les factures non réglées
-TotalCommission=Total des commissions
-
-ProductMargin=Marge / produits
-ServiceMargin=Marge / services
-
-CommissionRate=Taux de commissionnement
-
-ProductCommission=Commission / produits
-ServiceCommission=Commission / services
-
-CommissionBase=Base de calcul des commissions
-CommissionBasedOnTurnover=Commissions calculées sur le CA
-CommissionBasedOnMargins=Commissions calculées sur les marges
-CommissionBaseDetails=Définit le mode de calcul des commissions
-CommissionBasedOnMarginsDetails=Le calcul basé sur les marges nécessite l'activation du module marges.
-
-TurnoverTotal = Chiffre d'affaire réalisé HT
-ProductTurnover=CA HT / produits
-ServiceTurnover=CA HT / services
-
-CommercialAgent=Agent commercial
-
-StartDate=Date de début
-EndDate=Date de fin
-Launch=Démarrer
-
-AgentContactType=Type de contact commissionné
-AgentContactTypeDetails=Permet de définir le type de contact associé aux factures qui sera associé aux agents commerciaux
\ No newline at end of file
diff --git a/htdocs/theme/auguria/img/object_commissions.png b/htdocs/theme/auguria/img/object_commissions.png
deleted file mode 100644
index 39f09967046b32c8563a44af9da1b0b454175626..0000000000000000000000000000000000000000
Binary files a/htdocs/theme/auguria/img/object_commissions.png and /dev/null differ
diff --git a/htdocs/theme/bureau2crea/img/object_commissions.png b/htdocs/theme/bureau2crea/img/object_commissions.png
deleted file mode 100644
index 39f09967046b32c8563a44af9da1b0b454175626..0000000000000000000000000000000000000000
Binary files a/htdocs/theme/bureau2crea/img/object_commissions.png and /dev/null differ
diff --git a/htdocs/theme/cameleo/img/object_commissions.png b/htdocs/theme/cameleo/img/object_commissions.png
deleted file mode 100644
index 39f09967046b32c8563a44af9da1b0b454175626..0000000000000000000000000000000000000000
Binary files a/htdocs/theme/cameleo/img/object_commissions.png and /dev/null differ
diff --git a/htdocs/theme/eldy/img/object_commissions.png b/htdocs/theme/eldy/img/object_commissions.png
deleted file mode 100644
index 39f09967046b32c8563a44af9da1b0b454175626..0000000000000000000000000000000000000000
Binary files a/htdocs/theme/eldy/img/object_commissions.png and /dev/null differ