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

Add Partially Received Order and Delay

Browse Source 
Edit file to allow following order received partially and to upgrade lisibility of delayed orders
This commit is contained in:
BlueGarm 2020-11-14 13:25:02 +01:00
parent 0c37d31e04
commit 2425cf82d3
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2987,7 +2987,7 @@ class CommandeFournisseur extends CommonOrder
} }
$sql .= $clause." c.entity = ".$conf->entity; $sql .= $clause." c.entity = ".$conf->entity;
if ($mode === 'awaiting') { if ($mode === 'awaiting') {
$sql .= " AND c.fk_statut = ".self::STATUS_ORDERSENT; $sql .= " AND c.fk_statut IN (".self::STATUS_ORDERSENT.", ".self::STATUS_RECEIVED_PARTIALLY.")";
} }
else { else {
$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")"; $sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
@ -3009,7 +3009,7 @@ class CommandeFournisseur extends CommonOrder
if ($mode === 'awaiting') { if ($mode === 'awaiting') {
$response->label = $langs->trans("SuppliersOrdersAwaitingReception"); $response->label = $langs->trans("SuppliersOrdersAwaitingReception");
$response->labelShort = $langs->trans("AwaitingReception"); $response->labelShort = $langs->trans("AwaitingReception");
$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3&mainmenu=commercial&leftmenu=orders_suppliers'; $response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3,4&mainmenu=commercial&leftmenu=orders_suppliers';
} }
while ($obj = $this->db->fetch_object($resql)) while ($obj = $this->db->fetch_object($resql))
@ -3175,9 +3175,9 @@ class CommandeFournisseur extends CommonOrder
if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility if (empty($this->date_delivery) && !empty($this->date_livraison)) $this->date_delivery = $this->date_livraison; // For backward compatibility
$now = dol_now(); $now = dol_now();
$date_to_test = empty($this->date_delivery) ? $this->date_commande : $this->date_delivery; $date_to_test = empty($this->date_livraison) ? $this->date_commande : $this->date_livraison;
return ($this->statut > 0 && $this->statut < 4) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay); return ($this->statut > 0 && $this->statut < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
} }
/** /**

6
htdocs/fourn/commande/card.php
View File

@ -2065,9 +2065,9 @@ elseif (!empty($object->id))
if ($object->methode_commande_id > 0) if ($object->methode_commande_id > 0)
{ {
print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'; print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>';
if ($object->date_commande) print $object->date_commande ? dol_print_date($object->date_commande, $usehourmin) : '&nbsp;';
{ if ($object->hasDelay() && empty($object->date_livraison) && !empty($object->date_commande)) {
print dol_print_date($object->date_commande, "dayhour")."\n"; print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
} }
print "</td></tr>"; print "</td></tr>";

7
htdocs/fourn/commande/list.php
View File

@ -1001,6 +1001,7 @@ if ($resql)
$objectstatic->total_ht = $obj->total_ht; $objectstatic->total_ht = $obj->total_ht;
$objectstatic->total_tva = $obj->total_tva; $objectstatic->total_tva = $obj->total_tva;
$objectstatic->total_ttc = $obj->total_ttc; $objectstatic->total_ttc = $obj->total_ttc;
$objectstatic->date_commande = $db->jdate($obj->date_commande);
$objectstatic->date_delivery = $db->jdate($obj->date_delivery); $objectstatic->date_delivery = $db->jdate($obj->date_delivery);
$objectstatic->note_public = $obj->note_public; $objectstatic->note_public = $obj->note_public;
$objectstatic->note_private = $obj->note_private; $objectstatic->note_private = $obj->note_private;
@ -1110,8 +1111,10 @@ if ($resql)
if (!empty($arrayfields['cf.date_commande']['checked'])) if (!empty($arrayfields['cf.date_commande']['checked']))
{ {
print '<td class="center">'; print '<td class="center">';
if ($obj->date_commande) print dol_print_date($db->jdate($obj->date_commande), 'day'); print dol_print_date($db->jdate($obj->date_commande), 'day');
else print ''; if ($objectstatic->hasDelay() && empty($objectstatic->date_delivery)) {
print ' '.img_picto($langs->trans("Late").' : '.$objectstatic->showDelay(), "warning");
}
print '</td>'; print '</td>';
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
} }