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

Close #8907

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-01 15:01:29 +02:00
parent b79831ec39
commit ce090d43a0
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/fourn/card.php
View File

@ -605,9 +605,16 @@ if ($object->id > 0)
$sql2.= ' WHERE c.fk_soc = s.rowid'; $sql2.= ' WHERE c.fk_soc = s.rowid';
$sql2.= " AND c.entity IN (".getEntity('commande_fournisseur').")"; $sql2.= " AND c.entity IN (".getEntity('commande_fournisseur').")";
$sql2.= ' AND s.rowid = '.$object->id; $sql2.= ' AND s.rowid = '.$object->id;
// Show orders with status validated, shipping started and delivered (even if any order we can bill). // Show orders we can bill
//$sql2.= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
{
$sql2.= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/orderstoinvoice.php $sql2.= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/orderstoinvoice.php
}
else
{
// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
$sql2.= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
}
$sql2.= " AND c.billed = 0"; $sql2.= " AND c.billed = 0";
// Find order that are not already invoiced // Find order that are not already invoiced
// just need to check received status because we have the billed status now // just need to check received status because we have the billed status now

11
htdocs/fourn/commande/orderstoinvoice.php
View File

@ -449,8 +449,17 @@ if (($action != 'create' && $action != 'add') && !$error) {
$sql .= ' WHERE c.entity = ' . $conf->entity; $sql .= ' WHERE c.entity = ' . $conf->entity;
$sql .= ' AND c.fk_soc = s.rowid'; $sql .= ' AND c.fk_soc = s.rowid';
// Show orders with status validated, shipping started and delivered (well any order we can bill) // Show orders we can bill
if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
{
$sql.= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/card.php $sql.= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY.")"; // Must match filter in htdocs/fourn/card.php
}
else
{
// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
$sql.= " AND c.fk_statut IN (".$db->escape($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS).")";
}
$sql .= " AND c.billed = 0"; $sql .= " AND c.billed = 0";
// Find order that are not already invoiced // Find order that are not already invoiced