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

changes to not diplay won and lost and add on migration

Browse Source
This commit is contained in:
lmarcouiller 2020-12-03 10:11:16 +01:00
parent c7a31b2458
commit 032116b235
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
htdocs/core/boxes/box_funnel_of_prospection.php
View File

@ -33,7 +33,7 @@ class box_funnel_of_prospection extends ModeleBoxes
{ {
public $boxcode = "FunnelOfProspection"; public $boxcode = "FunnelOfProspection";
public $boximg = "object_projectpub"; public $boximg = "object_projectpub";
public $boxlabel = "BoxFunnelOfProspection"; public $boxlabel = "BoxTitleFunnelOfProspection";
public $depends = array("projet"); public $depends = array("projet");
/** /**
@ -104,12 +104,6 @@ class box_funnel_of_prospection extends ModeleBoxes
case 'NEGO': case 'NEGO':
$colorseriesstat[$objp->rowid] = $badgeStatus4; $colorseriesstat[$objp->rowid] = $badgeStatus4;
break; break;
case 'LOST':
$colorseriesstat[$objp->rowid] = $badgeStatus9;
break;
case 'WON':
$colorseriesstat[$objp->rowid] = $badgeStatus6;
break;
default: default:
$colorseriesstat[$objp->rowid] = $badgeStatus2; $colorseriesstat[$objp->rowid] = $badgeStatus2;
break; break;
@ -133,6 +127,7 @@ class box_funnel_of_prospection extends ModeleBoxes
$sql .= " WHERE p.entity IN (" . getEntity('project') . ")"; $sql .= " WHERE p.entity IN (" . getEntity('project') . ")";
$sql .= " AND p.fk_opp_status = cls.rowid"; $sql .= " AND p.fk_opp_status = cls.rowid";
$sql .= " AND p.fk_statut = 1"; // Opend projects only $sql .= " AND p.fk_statut = 1"; // Opend projects only
$sql .= " AND cls.code NOT IN ('WON', 'LOST')";
$sql .= " GROUP BY p.fk_opp_status, cls.code"; $sql .= " GROUP BY p.fk_opp_status, cls.code";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@ -156,10 +151,8 @@ class box_funnel_of_prospection extends ModeleBoxes
$valsamount[$obj->opp_status] = $obj->opp_amount; $valsamount[$obj->opp_status] = $obj->opp_amount;
$totalnb += $obj->nb; $totalnb += $obj->nb;
if ($obj->opp_status) $totaloppnb += $obj->nb; if ($obj->opp_status) $totaloppnb += $obj->nb;
if (!in_array($obj->code, array('WON', 'LOST'))) { $totalamount += $obj->opp_amount;
$totalamount += $obj->opp_amount; $ponderated_opp_amount += $obj->ponderated_opp_amount;
$ponderated_opp_amount += $obj->ponderated_opp_amount;
}
} }
$i++; $i++;
} }
@ -171,17 +164,18 @@ class box_funnel_of_prospection extends ModeleBoxes
$listofstatus = array_keys($listofoppstatus); $listofstatus = array_keys($listofoppstatus);
foreach ($listofstatus as $status) { foreach ($listofstatus as $status) {
$labelStatus = ''; $labelStatus = '';
if ($status != 7 && $status != 6) {
$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code');
if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code);
if (empty($labelStatus)) $labelStatus = $listofopplabel[$status];
$code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code'); $dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0));
if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code); if (!$conf->use_javascript_ajax) {
if (empty($labelStatus)) $labelStatus = $listofopplabel[$status]; $stringtoprint .= '<tr class="oddeven">';
$stringtoprint .= '<td>' . $labelStatus . '</td>';
$dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0)); $stringtoprint .= '<td class="right"><a href="list.php?statut=' . $status . '">' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '</a></td>';
if (!$conf->use_javascript_ajax) { $stringtoprint .= "</tr>\n";
$stringtoprint .= '<tr class="oddeven">'; }
$stringtoprint .= '<td>' . $labelStatus . '</td>';
$stringtoprint .= '<td class="right"><a href="list.php?statut=' . $status . '">' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '</a></td>';
$stringtoprint .= "</tr>\n";
} }
} }
if ($conf->use_javascript_ajax) { if ($conf->use_javascript_ajax) {
@ -231,7 +225,7 @@ class box_funnel_of_prospection extends ModeleBoxes
'tr' => 'class="oddeven"', 'tr' => 'class="oddeven"',
'td' => 'class="left "', 'td' => 'class="left "',
'maxlength' => 500, 'maxlength' => 500,
'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1) 'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount") . ' (' . $langs->trans("WonLostExcluded") . ')', $langs->trans("OpportunityPonderatedAmountDesc"), 1)
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$line][] = array(

3
htdocs/install/mysql/migration/12.0.0-13.0.0.sql
View File

@ -439,7 +439,6 @@ INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1)
ALTER TABLE llx_product MODIFY COLUMN finished tinyint DEFAULT NULL; ALTER TABLE llx_product MODIFY COLUMN finished tinyint DEFAULT NULL;
ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code); ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code);
-- MIGRATION TO DO AFTER RENAMING AN OBJECT -- MIGRATION TO DO AFTER RENAMING AN OBJECT
-- drop constraint -- drop constraint
@ -542,3 +541,5 @@ CREATE TABLE llx_session(
user_agent varchar(128) NULL user_agent varchar(128) NULL
)ENGINE=innodb; )ENGINE=innodb;
INSERT INTO llx_boxes_def(file,entity) VALUES ('box_funnel_of_prospection.php',1);
INSERT INTO llx_boxes (box_id, position, box_order, maxline, params) VALUES ((SELECT b.rowid FROM llx_boxes_def as b WHERE file = 'box_funnel_of_prospection.php'), 0, 0, NULL, NULL);

1
htdocs/langs/en_US/boxes.lang
View File

@ -50,6 +50,7 @@ BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding
BoxGlobalActivity=Global activity (invoices, proposals, orders) BoxGlobalActivity=Global activity (invoices, proposals, orders)
BoxGoodCustomers=Good customers BoxGoodCustomers=Good customers
BoxTitleGoodCustomers=%s Good customers BoxTitleGoodCustomers=%s Good customers
BoxTitleFunnelOfProspection=Amount of prospection by status
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
LastRefreshDate=Latest refresh date LastRefreshDate=Latest refresh date
NoRecordedBookmarks=No bookmarks defined. NoRecordedBookmarks=No bookmarks defined.