lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10534 from OPEN-DSI/fix-margin-agents2

Browse Source 
Fix calcul margin by seller and parameters send (filters)
This commit is contained in:
Laurent Destailleur 2019-02-12 13:31:56 +01:00 committed by GitHub
commit 7874aa374c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 105 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
htdocs/margin/agentMargins.php
View File

@ -54,10 +54,17 @@ if (! $sortfield)
$startdate=$enddate=''; $startdate=$enddate='';
if (!empty($_POST['startdatemonth'])) $startdateday = GETPOST('startdateday','int');
$startdate = dol_mktime(0, 0, 0, $_POST['startdatemonth'], $_POST['startdateday'], $_POST['startdateyear']); $startdatemonth = GETPOST('startdatemonth','int');
if (!empty($_POST['enddatemonth'])) $startdateyear = GETPOST('startdateyear','int');
$enddate = dol_mktime(23, 59, 59, $_POST['enddatemonth'], $_POST['enddateday'], $_POST['enddateyear']); $enddateday = GETPOST('enddateday','int');
$enddatemonth = GETPOST('enddatemonth','int');
$enddateyear = GETPOST('enddateyear','int');
if (!empty($startdatemonth))
$startdate = dol_mktime(0, 0, 0, $startdatemonth, $startdateday, $startdateyear);
if (!empty($enddatemonth))
$enddate = dol_mktime(23, 59, 59, $enddatemonth, $enddateday, $enddateyear);
// Security check // Security check
if ($user->rights->margins->read->all) { if ($user->rights->margins->read->all) {
@ -126,8 +133,7 @@ dol_fiche_end();
print '</form>'; print '</form>';
$sql = "SELECT"; $sql = "SELECT";
$sql.= " s.rowid as socid,"; $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
if ($agentid > 0) $sql.= " s.nom as name, s.code_client, s.client,";
$sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,"; $sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,";
$sql.= " sum(d.total_ht) as selling_price,"; $sql.= " sum(d.total_ht) as selling_price,";
// Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this) // Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
@ -162,9 +168,10 @@ if (!empty($enddate))
$sql.= " AND f.datef <= '".$db->idate($enddate)."'"; $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
$sql .= " AND d.buy_price_ht IS NOT NULL"; $sql .= " AND d.buy_price_ht IS NOT NULL";
if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0"; if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1) $sql .= " AND d.buy_price_ht <> 0";
if ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname"; //if ($agentid > 0) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
else $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname"; //else $sql.= " GROUP BY u.rowid, u.login, u.lastname, u.firstname";
$sql.=$db->order($sortfield, $sortorder); $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, u.rowid, u.login, u.lastname, u.firstname";
$sql.=$db->order($sortfield,$sortorder);
// TODO: calculate total to display then restore pagination // TODO: calculate total to display then restore pagination
//$sql.= $db->plimit($conf->liste_limit +1, $offset); //$sql.= $db->plimit($conf->liste_limit +1, $offset);
@ -172,6 +179,15 @@ $sql.=$db->order($sortfield, $sortorder);
print '<br>'; print '<br>';
print img_info('').' '.$langs->trans("MarginPerSaleRepresentativeWarning").'<br>'; print img_info('').' '.$langs->trans("MarginPerSaleRepresentativeWarning").'<br>';
$param='';
if (!empty($agentid)) $param .= "&amp;agentid=".urlencode($agentid);
if (!empty($startdateday)) $param .= "&amp;startdateday=".urlencode($startdateday);
if (!empty($startdatemonth)) $param .= "&amp;startdatemonth=".urlencode($startdatemonth);
if (!empty($startdateyear)) $param .= "&amp;startdateyear=".urlencode($startdateyear);
if (!empty($enddateday)) $param .= "&amp;enddateday=".urlencode($enddateday);
if (!empty($enddatemonth)) $param .= "&amp;enddatemonth=".urlencode($enddatemonth);
if (!empty($enddateyear)) $param .= "&amp;enddateyear=".urlencode($enddateyear);
dol_syslog('margin::agentMargins.php', LOG_DEBUG); dol_syslog('margin::agentMargins.php', LOG_DEBUG);
$result = $db->query($sql); $result = $db->query($sql);
@ -191,80 +207,101 @@ if ($result)
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if ($agentid > 0) if ($agentid > 0)
print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "s.nom", "", "&amp;agentid=".$agentid, '', $sortfield, $sortorder); print_liste_field_titre("Customer",$_SERVER["PHP_SELF"],"s.nom","",$param,'',$sortfield,$sortorder);
else else
print_liste_field_titre("SalesRepresentative", $_SERVER["PHP_SELF"], "u.lastname", "", "&amp;agentid=".$agentid, '', $sortfield, $sortorder); print_liste_field_titre("SalesRepresentative",$_SERVER["PHP_SELF"],"u.lastname","",$param,'',$sortfield,$sortorder);
print_liste_field_titre("SellingPrice", $_SERVER["PHP_SELF"], "selling_price", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder); print_liste_field_titre("SellingPrice",$_SERVER["PHP_SELF"],"selling_price","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($labelcostprice, $_SERVER["PHP_SELF"], "buying_price", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder); print_liste_field_titre($labelcostprice,$_SERVER["PHP_SELF"],"buying_price","",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre("Margin", $_SERVER["PHP_SELF"], "marge", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder); print_liste_field_titre("Margin",$_SERVER["PHP_SELF"],"marge","",$param,'align="right"',$sortfield,$sortorder);
if (! empty($conf->global->DISPLAY_MARGIN_RATES)) if (! empty($conf->global->DISPLAY_MARGIN_RATES))
print_liste_field_titre("MarginRate", $_SERVER["PHP_SELF"], "", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder); print_liste_field_titre("MarginRate",$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
if (! empty($conf->global->DISPLAY_MARK_RATES)) if (! empty($conf->global->DISPLAY_MARK_RATES))
print_liste_field_titre("MarkRate", $_SERVER["PHP_SELF"], "", "", "&amp;agentid=".$agentid, 'align="right"', $sortfield, $sortorder); print_liste_field_titre("MarkRate",$_SERVER["PHP_SELF"],"","",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n"; print "</tr>\n";
$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT); $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
if ($num > 0) if ($num > 0)
{ {
$var=true;
while ($i < $num /*&& $i < $conf->liste_limit*/) $group_list = array();
{ while ($objp = $db->fetch_object($result)) {
$objp = $db->fetch_object($result); if ($agentid > 0) {
$group_id = $objp->socid;
} else {
$group_id = $objp->agent;
}
$seller_nb = 1; if (!isset($group_list[$group_id])) {
if ($objp->socid > 0) { if ($agentid > 0) {
// sql nb sellers $group_name = $objp->name;
$sql_seller = "SELECT COUNT(sc.rowid) as nb"; $companystatic->id = $objp->socid;
$sql_seller .= " FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; $companystatic->name = $objp->name;
$sql_seller .= " WHERE sc.fk_soc = " . $objp->socid; $companystatic->client = $objp->client;
$group_htmlname = $companystatic->getNomUrl(1,'customer');
} else {
$group_name = $objp->lastname;
$userstatic->fetch($objp->agent);
$group_htmlname = $userstatic->getFullName($langs,0,0,0);
}
$group_list[$group_id] = array('name' => $group_name, 'htmlname' => $group_htmlname, 'selling_price' => 0, 'buying_price' => 0, 'marge' => 0);
}
$resql_seller = $db->query($sql_seller); $seller_nb = 1;
if (!$resql_seller) { if ($objp->socid > 0) {
dol_print_error($db); // sql nb sellers
} else { $sql_seller = "SELECT COUNT(sc.rowid) as nb";
if ($obj_seller = $db->fetch_object($resql_seller)) { $sql_seller .= " FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
if ($obj_seller->nb > 0) { $sql_seller .= " WHERE sc.fk_soc = " . $objp->socid;
$seller_nb = $obj_seller->nb; $sql_seller .= " LIMIT 1";
}
} $resql_seller = $db->query($sql_seller);
if (!$resql_seller) {
dol_print_error($db);
} else {
if ($obj_seller = $db->fetch_object($resql_seller)) {
if ($obj_seller->nb > 0) {
$seller_nb = $obj_seller->nb;
} }
} }
}
}
$pa = $objp->buying_price / $seller_nb; $group_list[$group_id]['selling_price'] += $objp->selling_price / $seller_nb;
$pv = $objp->selling_price / $seller_nb; $group_list[$group_id]['buying_price'] += $objp->buying_price / $seller_nb;
$marge = $objp->marge / $seller_nb; $group_list[$group_id]['marge'] += $objp->marge / $seller_nb;
}
$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ; // sort group array by sortfield
$markRate = ($pv != 0)?(100 * $marge / $pv):'' ; if ($sortfield == 'u.lastname' || $sortfield == 's.nom') {
$sortfield = 'name';
}
$group_list = dol_sort_array($group_list, $sortfield, $sortorder);
print '<tr class="oddeven">'; foreach ($group_list as $group_id => $group_array) {
if ($agentid > 0) { $pa = $group_array['buying_price'];
$companystatic->id=$objp->socid; $pv = $group_array['selling_price'];
$companystatic->name=$objp->name; $marge = $group_array['marge'];
$companystatic->client=$objp->client;
print "<td>".$companystatic->getNomUrl(1, 'customer')."</td>\n";
}
else {
$userstatic->fetch($objp->agent);
print "<td>".$userstatic->getFullName($langs, 0, 0, 0)."</td>\n";
}
print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n"; $marginRate = ($pa != 0)?(100 * $marge / $pa):'';
print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n"; $markRate = ($pv != 0)?(100 * $marge / $pv):'';
print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
print "</tr>\n";
$i++; print '<tr class="oddeven">';
} print "<td>".$group_array['htmlname']."</td>\n";
} print "<td align=\"right\">".price($pv, null, null, null, null, $rounding)."</td>\n";
print "</table>"; print "<td align=\"right\">".price($pa, null, null, null, null, $rounding)."</td>\n";
print "<td align=\"right\">".price($marge, null, null, null, null, $rounding)."</td>\n";
if (! empty($conf->global->DISPLAY_MARGIN_RATES))
print "<td align=\"right\">".(($marginRate === '')?'n/a':price($marginRate, null, null, null, null, $rounding)."%")."</td>\n";
if (! empty($conf->global->DISPLAY_MARK_RATES))
print "<td align=\"right\">".(($markRate === '')?'n/a':price($markRate, null, null, null, null, $rounding)."%")."</td>\n";
print "</tr>\n";
}
}
print "</table>";
} }
else else
{ {