Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

This commit is contained in:
Laurent Destailleur 2020-01-28 11:04:53 +01:00
commit b96650b541

View File

@ -215,7 +215,7 @@ if (!$rowid)
print "</td>\n"; print "</td>\n";
// Origine // Origine
print "<td>"; print "<td>";
if ($charge->metadata->dol_type=="order") { if ($charge->metadata->dol_type=="order" || $charge->metadata->dol_type=="commande") {
$object = new Commande($db); $object = new Commande($db);
$object->fetch($charge->metadata->dol_id); $object->fetch($charge->metadata->dol_id);
if ($object->id > 0) { if ($object->id > 0) {
@ -223,7 +223,7 @@ if (!$rowid)
} else { } else {
print $FULLTAG; print $FULLTAG;
} }
} elseif ($charge->metadata->dol_type=="invoice") { } elseif ($charge->metadata->dol_type=="invoice" || $charge->metadata->dol_type=="facture") {
$object = new Facture($db); $object = new Facture($db);
$object->fetch($charge->metadata->dol_id); $object->fetch($charge->metadata->dol_id);
if ($object->id > 0) { if ($object->id > 0) {