diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 450a462c751..75e102b96bb 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -828,25 +828,25 @@ if ($id > 0)
print '
';
- if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
+ if (! empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status==1)
{
$langs->load("propal");
print '
';
}
- if (! empty($conf->commande->enabled) && $user->rights->commande->creer)
+ if (! empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status==1)
{
$langs->load("orders");
print '
';
}
- if ($user->rights->contrat->creer)
+ if ($user->rights->contrat->creer && $object->status==1)
{
$langs->load("contracts");
print '
';
}
- if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer)
+ if (! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status==1)
{
$langs->load("fichinter");
print '
';
@@ -855,7 +855,7 @@ if ($id > 0)
// Add invoice
if ($user->societe_id == 0)
{
- if (! empty($conf->deplacement->enabled))
+ if (! empty($conf->deplacement->enabled) && $object->status==1)
{
$langs->load("trips");
print '
';
@@ -863,7 +863,7 @@ if ($id > 0)
if (! empty($conf->facture->enabled))
{
- if ($user->rights->facture->creer)
+ if ($user->rights->facture->creer && $object->status==1)
{
$langs->load("bills");
$langs->load("orders");
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index b5302063a65..5fef6f8ae29 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1267,7 +1267,7 @@ if ($action == 'create')
print '';
} else {
print '
';
- print $form->select_company('', 'socid', 's.client = 1 OR s.client = 2 OR s.client = 3', 1);
+ print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 1);
print ' | ';
}
print '' . "\n";