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

Added due date to due invoices boxes and re-ordered by due date instead of invoice date

Browse Source
This commit is contained in:
ywarnier 2008-05-30 07:22:10 +00:00
parent 69eb5d9af9
commit 433be914bf
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/includes/boxes/box_factures_fourn_imp.php
View File

@ -83,7 +83,7 @@ class box_factures_fourn_imp extends ModeleBoxes {
{ {
$sql .= " AND s.rowid = ".$user->societe_id; $sql .= " AND s.rowid = ".$user->societe_id;
} }
$sql .= " ORDER BY f.datef DESC, f.facnumber DESC "; $sql .= " ORDER BY datelimite DESC, f.facnumber DESC ";
$sql .= $db->plimit($max, 0); $sql .= $db->plimit($max, 0);
$result = $db->query($sql); $result = $db->query($sql);
@ -110,8 +110,11 @@ class box_factures_fourn_imp extends ModeleBoxes {
$this->info_box_contents[$i][1] = array('align' => 'left', $this->info_box_contents[$i][1] = array('align' => 'left',
'text' => $objp->nom, 'text' => $objp->nom,
'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid); 'url' => DOL_URL_ROOT."/fourn/fiche.php?socid=".$objp->socid);
$this->info_box_contents[$i][2] = array('align' => 'right',
'text' => dolibarr_print_date($objp->datelimite,'day'));
$this->info_box_contents[$i][2] = array( $this->info_box_contents[$i][3] = array(
'align' => 'right', 'align' => 'right',
'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3)); 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3));
@ -124,15 +127,13 @@ class box_factures_fourn_imp extends ModeleBoxes {
if ($num==0 && $i==$num) if ($num==0 && $i==$num)
{ {
$this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoUnpayedCustomerBills")); $this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoUnpayedCustomerBills"));
$this->info_box_contents[$i][1] = array('text'=>' ');
$this->info_box_contents[$i][2] = array('text'=>' ');
$this->info_box_contents[$i][3] = array('text'=>' ');
} else { } else {
$this->info_box_contents[$i][0] = array('text'=>' '); $this->info_box_contents[$i][0] = array('text'=>' ');
$this->info_box_contents[$i][1] = array('text'=>' ');
$this->info_box_contents[$i][2] = array('text'=>' ');
$this->info_box_contents[$i][3] = array('text'=>' ');
} }
$this->info_box_contents[$i][1] = array('text'=>' ');
$this->info_box_contents[$i][2] = array('text'=>' ');
$this->info_box_contents[$i][3] = array('text'=>' ');
$this->info_box_contents[$i][4] = array('text'=>' ');
$i++; $i++;
} }
} }

20
htdocs/includes/boxes/box_factures_imp.php
View File

@ -84,7 +84,7 @@ class box_factures_imp extends ModeleBoxes {
$sql .= " AND s.rowid = ".$user->societe_id; $sql .= " AND s.rowid = ".$user->societe_id;
} }
//$sql .= " ORDER BY f.datef DESC, f.facnumber DESC "; //$sql .= " ORDER BY f.datef DESC, f.facnumber DESC ";
$sql .= " ORDER BY f.datef ASC, f.facnumber ASC "; $sql .= " ORDER BY datelimite ASC, f.facnumber ASC ";
$sql .= $db->plimit($max, 0); $sql .= $db->plimit($max, 0);
$result = $db->query($sql); $result = $db->query($sql);
@ -113,9 +113,13 @@ class box_factures_imp extends ModeleBoxes {
'maxlength'=>44, 'maxlength'=>44,
'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid); 'url' => DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->socid);
$this->info_box_contents[$i][2] = array( $this->info_box_contents[$i][2] = array('align' => 'right',
'text' => dolibarr_print_date($objp->datelimite,'day'),
);
$this->info_box_contents[$i][3] = array(
'align' => 'right', 'align' => 'right',
'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3)); 'text' => $facturestatic->LibStatut($objp->paye,$objp->fk_statut,3));
$i++; $i++;
} }
@ -126,15 +130,13 @@ class box_factures_imp extends ModeleBoxes {
if ($num==0 && $i==$num) if ($num==0 && $i==$num)
{ {
$this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoUnpayedCustomerBills")); $this->info_box_contents[$i][0] = array('align' => 'center','text'=>$langs->trans("NoUnpayedCustomerBills"));
$this->info_box_contents[$i][1] = array('text'=>' ');
$this->info_box_contents[$i][2] = array('text'=>' ');
$this->info_box_contents[$i][3] = array('text'=>' ');
} else { } else {
$this->info_box_contents[$i][0] = array('text'=>' '); $this->info_box_contents[$i][0] = array('text'=>' ');
$this->info_box_contents[$i][1] = array('text'=>' ');
$this->info_box_contents[$i][2] = array('text'=>' ');
$this->info_box_contents[$i][3] = array('text'=>' ');
} }
$this->info_box_contents[$i][1] = array('text'=>' ');
$this->info_box_contents[$i][2] = array('text'=>' ');
$this->info_box_contents[$i][3] = array('text'=>' ');
$this->info_box_contents[$i][4] = array('text'=>' ');
$i++; $i++;
} }
} }