diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
new file mode 100644
index 00000000000..fafb967ace1
--- /dev/null
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -0,0 +1,450 @@
+
+ *
+ * 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 .
+ */
+
+/**
+ * \file htdocs/compta/stats/supplier_turnover_by_prodserv.php
+ * \brief Page reporting purchase turnover by Products & Services
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("products", "categories", "errors", 'accountancy'));
+
+// Security pack (data & check)
+$socid = GETPOST('socid', 'int');
+
+if ($user->socid > 0) $socid = $user->socid;
+if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
+if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+
+// Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
+$modecompta = $conf->global->ACCOUNTING_MODE;
+if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta");
+
+$sortorder = isset($_GET["sortorder"]) ? $_GET["sortorder"] : $_POST["sortorder"];
+$sortfield = isset($_GET["sortfield"]) ? $_GET["sortfield"] : $_POST["sortfield"];
+if (!$sortorder) $sortorder = "asc";
+if (!$sortfield) $sortfield = "ref";
+
+// Category
+$selected_cat = (int) GETPOST('search_categ', 'int');
+$selected_soc = (int) GETPOST('search_soc', 'int');
+$subcat = false;
+if (GETPOST('subcat', 'alpha') === 'yes') {
+ $subcat = true;
+}
+// product/service
+$selected_type = GETPOST('search_type', 'int');
+if ($selected_type == '') $selected_type = -1;
+
+// Date range
+$year = GETPOST("year");
+$month = GETPOST("month");
+$date_startyear = GETPOST("date_startyear");
+$date_startmonth = GETPOST("date_startmonth");
+$date_startday = GETPOST("date_startday");
+$date_endyear = GETPOST("date_endyear");
+$date_endmonth = GETPOST("date_endmonth");
+$date_endday = GETPOST("date_endday");
+if (empty($year))
+{
+ $year_current = strftime("%Y", dol_now());
+ $month_current = strftime("%m", dol_now());
+ $year_start = $year_current;
+} else {
+ $year_current = $year;
+ $month_current = strftime("%m", dol_now());
+ $year_start = $year;
+}
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
+// Quarter
+if (empty($date_start) || empty($date_end)) // We define date_start and date_end
+{
+ $q = GETPOST("q", "int");
+ if (empty($q))
+ {
+ // We define date_start and date_end
+ $month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
+ $year_end = $year_start;
+ $month_end = $month_start;
+ if (!GETPOST("month")) // If month not forced
+ {
+ if (!GETPOST('year') && $month_start > $month_current)
+ {
+ $year_start--;
+ $year_end--;
+ }
+ $month_end = $month_start - 1;
+ if ($month_end < 1) $month_end = 12;
+ else $year_end++;
+ }
+ $date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
+ }
+ else
+ {
+ if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
+ if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
+ if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
+ if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+ }
+} else {
+ // TODO We define q
+}
+
+// $date_start and $date_end are defined. We force $year_start and $nbofyear
+$tmps = dol_getdate($date_start);
+$year_start = $tmps['year'];
+$tmpe = dol_getdate($date_end);
+$year_end = $tmpe['year'];
+$nbofyear = ($year_end - $year_start) + 1;
+
+$commonparams = array();
+if (!empty($modecompta)) $commonparams['modecompta'] = $modecompta;
+if (!empty($sortorder)) $commonparams['sortorder'] = $sortorder;
+if (!empty($sortfield)) $commonparams['sortfield'] = $sortfield;
+
+$headerparams = array();
+if (!empty($date_startyear)) $headerparams['date_startyear'] = $date_startyear;
+if (!empty($date_startmonth)) $headerparams['date_startmonth'] = $date_startmonth;
+if (!empty($date_startday)) $headerparams['date_startday'] = $date_startday;
+if (!empty($date_endyear)) $headerparams['date_endyear'] = $date_endyear;
+if (!empty($date_endmonth)) $headerparams['date_endmonth'] = $date_endmonth;
+if (!empty($date_endday)) $headerparams['date_endday'] = $date_endday;
+if (!empty($year)) $headerparams['year'] = $year;
+if (!empty($month)) $headerparams['month'] = $month;
+$headerparams['q'] = $q;
+
+$tableparams = array();
+if (!empty($selected_cat)) $tableparams['search_categ'] = $selected_cat;
+if (!empty($selected_soc)) $tableparams['search_soc'] = $selected_soc;
+if (!empty($selected_type)) $tableparams['search_type'] = $selected_type;
+$tableparams['subcat'] = ($subcat === true) ? 'yes' : '';
+
+// Adding common parameters
+$allparams = array_merge($commonparams, $headerparams, $tableparams);
+$headerparams = array_merge($commonparams, $headerparams);
+$tableparams = array_merge($commonparams, $tableparams);
+
+foreach ($allparams as $key => $value) {
+ $paramslink .= '&'.$key.'='.$value;
+}
+
+
+/*
+ * View
+ */
+
+llxHeader();
+
+$form = new Form($db);
+$formother = new FormOther($db);
+
+// TODO Report from bookkeeping not yet available, so we switch on report on business events
+if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
+if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+
+// Show report header
+if ($modecompta == "CREANCES-DETTES") {
+ $name = $langs->trans("PurchaseTurnover").', '.$langs->trans("ByProductsAndServices");
+ $calcmode = $langs->trans("CalcModeDebt");
+ //$calcmode.='
('.$langs->trans("SeeReportInInputOutputMode",'','').')';
+
+ $description = $langs->trans("RulesPurchaseTurnoverDue");
+ $builddate = dol_now();
+}
+elseif ($modecompta == "RECETTES-DEPENSES")
+{
+ $name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByProductsAndServices");
+ $calcmode = $langs->trans("CalcModeEngagement");
+ //$calcmode.='
('.$langs->trans("SeeReportInDueDebtMode",'','').')';
+ $description = $langs->trans("RulesPurchaseTurnoverIn");
+
+ $builddate = dol_now();
+}
+elseif ($modecompta == "BOOKKEEPING")
+{
+}
+elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
+{
+}
+
+$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = ''.img_previous().' '.img_next().'';
+else $periodlink = '';
+
+report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
+
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
+{
+ print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
+}
+
+
+
+$name = array();
+
+// SQL request
+$catotal = 0;
+$catotal_ht = 0;
+$qtytotal = 0;
+
+if ($modecompta == 'CREANCES-DETTES')
+{
+ $sql = "SELECT DISTINCT p.rowid as rowid, p.ref as ref, p.label as label, p.fk_product_type as product_type,";
+ $sql .= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
+ $sql .= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
+ $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+ if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+ $sql .= ",".MAIN_DB_PREFIX."facture_fourn_det as l";
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
+ if ($selected_cat === -2) // Without any category
+ {
+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
+ }
+ elseif ($selected_cat) // Into a specific category
+ {
+ $sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
+ }
+ $sql .= " WHERE l.fk_facture_fourn = f.rowid";
+ $sql .= " AND f.fk_statut in (1,2)";
+ $sql .= " AND f.type IN (0,2)";
+
+ if ($date_start && $date_end) {
+ $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+ }
+ if ($selected_type >= 0)
+ {
+ $sql .= " AND l.product_type = ".$selected_type;
+ }
+ if ($selected_cat === -2) // Without any category
+ {
+ $sql .= " AND cp.fk_product is null";
+ }
+ elseif ($selected_cat) { // Into a specific category
+ $sql .= " AND (c.rowid = ".$selected_cat;
+ if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+ $sql .= ")";
+ $sql .= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
+ }
+ if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
+ $sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
+ $sql .= " GROUP BY p.rowid, p.ref, p.label, p.fk_product_type";
+ $sql .= $db->order($sortfield, $sortorder);
+
+ dol_syslog("supplier_turnover_by_prodserv", LOG_DEBUG);
+ $result = $db->query($sql);
+ if ($result) {
+ $num = $db->num_rows($result);
+ $i = 0;
+ while ($i < $num) {
+ $obj = $db->fetch_object($result);
+ $amount_ht[$obj->rowid] = $obj->amount;
+ $amount[$obj->rowid] = $obj->amount_ttc;
+ $qty[$obj->rowid] = $obj->qty;
+ $name[$obj->rowid] = $obj->ref.' - '.$obj->label;
+ $type[$obj->rowid] = $obj->product_type;
+ $catotal_ht += $obj->amount;
+ $catotal += $obj->amount_ttc;
+ $qtytotal += $obj->qty;
+ $i++;
+ }
+ } else {
+ dol_print_error($db);
+ }
+
+ // Show Array
+ $i = 0;
+ print '
';
+} else {
+ // $modecompta != 'CREANCES-DETTES'
+ // "Calculation of part of each product for accountancy in this mode is not possible. When a partial payment (for example 5 euros) is done on an
+ // invoice with 2 product (product A for 10 euros and product B for 20 euros), what is part of paiment for product A and part of paiment for product B ?
+ // Because there is no way to know this, this report is not relevant.
+ print '
'.$langs->trans("TurnoverPerProductInCommitmentAccountingNotRelevant").'
';
+}
+
+// End of page
+llxFooter();
+$db->close();