Fix not visible template selector for supplier order/invoice emails

Conflicts:
	htdocs/fourn/facture/card.php
This commit is contained in:
Laurent Destailleur 2018-03-08 20:49:37 +01:00
parent af9fff4f83
commit ad96229ec4
2 changed files with 3 additions and 3 deletions

View File

@ -2695,7 +2695,7 @@ elseif (! empty($object->id))
} }
// Presend form // Presend form
$modelmail='supplier_order_send'; $modelmail='order_supplier_send';
$defaulttopic='SendOrderRef'; $defaulttopic='SendOrderRef';
$diroutput = $conf->fournisseur->commande->dir_output; $diroutput = $conf->fournisseur->commande->dir_output;
$trackid = 'sor'.$object->id; $trackid = 'sor'.$object->id;

View File

@ -265,7 +265,7 @@ if (empty($reshook))
$action=''; $action='';
} }
} }
elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer) elseif ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->fournisseur->facture->creer)
{ {
$object->fetch($id); $object->fetch($id);
@ -2928,7 +2928,7 @@ else
} }
// Presend form // Presend form
$modelmail='order_supplier_send'; $modelmail='invoice_supplier_send';
$defaulttopic='SendBillRef'; $defaulttopic='SendBillRef';
$diroutput = $conf->fournisseur->facture->dir_output; $diroutput = $conf->fournisseur->facture->dir_output;
$trackid = 'sin'.$object->id; $trackid = 'sin'.$object->id;