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

Merge pull request #10509 from OPEN-DSI/fix-margin-agents

Browse Source 
Fix margin by users when a thirdparty have many sellers
This commit is contained in:
Laurent Destailleur 2019-02-08 09:51:26 +01:00 committed by GitHub
commit 714516fc18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/margin/agentMargins.php
View File

@ -126,7 +126,8 @@ dol_fiche_end();
print '</form>'; print '</form>';
$sql = "SELECT"; $sql = "SELECT";
if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,"; $sql.= " s.rowid as socid,";
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)
@ -213,20 +214,31 @@ if ($result)
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$pa = $objp->buying_price; $seller_nb = 1;
$pv = $objp->selling_price; if ($objp->socid > 0) {
$marge = $objp->marge; // sql nb sellers
$sql_seller = "SELECT COUNT(sc.rowid) as nb";
$sql_seller .= " FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
$sql_seller .= " WHERE sc.fk_soc = " . $objp->socid;
if ($marge < 0) $resql_seller = $db->query($sql_seller);
{ if (!$resql_seller) {
$marginRate = ($pa != 0)?-1*(100 * $marge / $pa):'' ; dol_print_error($db);
$markRate = ($pv != 0)?-1*(100 * $marge / $pv):'' ; } else {
} if ($obj_seller = $db->fetch_object($resql_seller)) {
else if ($obj_seller->nb > 0) {
{ $seller_nb = $obj_seller->nb;
$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ; }
$markRate = ($pv != 0)?(100 * $marge / $pv):'' ; }
} }
}
$pa = $objp->buying_price / $seller_nb;
$pv = $objp->selling_price / $seller_nb;
$marge = $objp->marge / $seller_nb;
$marginRate = ($pa != 0)?(100 * $marge / $pa):'' ;
$markRate = ($pv != 0)?(100 * $marge / $pv):'' ;
print '<tr class="oddeven">'; print '<tr class="oddeven">';
if ($agentid > 0) { if ($agentid > 0) {