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

FIX #15582

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-02 15:16:04 +01:00
parent 25bedc3497
commit 409b73fe2c
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/boxes/box_customers_outstanding_bill_reached.php
View File

@ -106,7 +106,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
$sql .= " AND s.outstanding_limit > 0"; $sql .= " AND s.outstanding_limit > 0";
$sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)"; $sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)";
$sql .= " ORDER BY s.tms DESC"; $sql .= " ORDER BY s.tms DESC";
$sql .= $this->db->plimit($max, 0); //$sql .= $this->db->plimit($max, 0);
dol_syslog(get_class($this)."::loadBox", LOG_DEBUG); dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);
@ -114,10 +114,13 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
{ {
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
$nboutstandingbillreachedcustomers = 0;
$line = 0; $line = 0;
while ($line < $num) while ($line < $num)
{ {
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$datec = $this->db->jdate($objp->datec); $datec = $this->db->jdate($objp->datec);
$datem = $this->db->jdate($objp->tms); $datem = $this->db->jdate($objp->tms);
$thirdpartystatic->id = $objp->socid; $thirdpartystatic->id = $objp->socid;
@ -136,22 +139,21 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
$outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened']; $outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened'];
$outstandinglimit = $thirdpartystatic->outstanding_limit; $outstandinglimit = $thirdpartystatic->outstanding_limit;
$nboutstandingbillreachedcustomers = 0;
if ($outstandingtotal >= $outstandinglimit) if ($outstandingtotal >= $outstandinglimit)
{ {
$this->info_box_contents[$line][] = array( $this->info_box_contents[$nboutstandingbillreachedcustomers][] = array(
'td' => '', 'td' => '',
'text' => $thirdpartystatic->getNomUrl(1), 'text' => $thirdpartystatic->getNomUrl(1, 'customer'),
'asis' => 1, 'asis' => 1,
); );
$this->info_box_contents[$line][] = array( $this->info_box_contents[$nboutstandingbillreachedcustomers][] = array(
'td' => 'class="right" width="18"', 'td' => 'class="right" width="18"',
'text' => $thirdpartystatic->LibStatut($objp->status, 3) 'text' => $thirdpartystatic->LibStatut($objp->status, 3)
); );
$nboutstandingbillreachedcustomers++; $nboutstandingbillreachedcustomers++;
} }
$line++; $line++;
} }

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

@ -542,3 +542,4 @@ 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_customers_outstanding_bill_reached', 1);

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

@ -46,7 +46,7 @@ BoxTitleLastModifiedDonations=Latest %s modified donations
BoxTitleLastModifiedExpenses=Latest %s modified expense reports BoxTitleLastModifiedExpenses=Latest %s modified expense reports
BoxTitleLatestModifiedBoms=Latest %s modified BOMs BoxTitleLatestModifiedBoms=Latest %s modified BOMs
BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders
BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding exceeded BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
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