Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
This commit is contained in:
commit
7de18b9f79
@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2018 Thibault FOUCART <support@ptibogxiv.net>
|
/* Copyright (C) 2018-2022 Thibault FOUCART <support@ptibogxiv.net>
|
||||||
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
|
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -251,16 +251,15 @@ if (!$rowid) {
|
|||||||
$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) {
|
||||||
print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
|
print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'order')." ".$object->ref."</a>";
|
||||||
} else {
|
} else {
|
||||||
print $FULLTAG;
|
print $FULLTAG;
|
||||||
}
|
}
|
||||||
} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
|
} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
|
||||||
print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
|
|
||||||
$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) {
|
||||||
print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
|
print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'bill')." ".$object->ref."</a>";
|
||||||
} else {
|
} else {
|
||||||
print $FULLTAG;
|
print $FULLTAG;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user