Skip to content
Snippets Groups Projects
Commit 473693bb authored by Regis Houssin's avatar Regis Houssin
Browse files

Fix: select only prospects and customers

Fix: refresh page with confirm and validate action
parent 44b96129
No related branches found
No related tags found
No related merge requests found
...@@ -98,6 +98,8 @@ if ($_REQUEST['action'] == 'confirm_validate' && $_REQUEST['confirm'] == 'yes') ...@@ -98,6 +98,8 @@ if ($_REQUEST['action'] == 'confirm_validate' && $_REQUEST['confirm'] == 'yes')
$outputlangs->setDefaultLang($_REQUEST['lang_id']); $outputlangs->setDefaultLang($_REQUEST['lang_id']);
} }
$result=fichinter_create($db, $fichinter, $_REQUEST['model'], $outputlangs); $result=fichinter_create($db, $fichinter, $_REQUEST['model'], $outputlangs);
Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$fichinter->id);
exit;
} }
else else
{ {
...@@ -121,6 +123,8 @@ if ($_REQUEST['action'] == 'confirm_modify' && $_REQUEST['confirm'] == 'yes') ...@@ -121,6 +123,8 @@ if ($_REQUEST['action'] == 'confirm_modify' && $_REQUEST['confirm'] == 'yes')
$outputlangs->setDefaultLang($_REQUEST['lang_id']); $outputlangs->setDefaultLang($_REQUEST['lang_id']);
} }
$result=fichinter_create($db, $fichinter, (empty($_REQUEST['model'])?$fichinter->model:$_REQUEST['model']), $outputlangs); $result=fichinter_create($db, $fichinter, (empty($_REQUEST['model'])?$fichinter->model:$_REQUEST['model']), $outputlangs);
Header ('Location: '.$_SERVER["PHP_SELF"].'?id='.$fichinter->id);
exit;
} }
else else
{ {
...@@ -488,7 +492,7 @@ if ($_GET["action"] == 'create') ...@@ -488,7 +492,7 @@ if ($_GET["action"] == 'create')
print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="GET">'; print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="GET">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("Company").'</td><td>'; print '<tr><td>'.$langs->trans("Company").'</td><td>';
$html->select_societes('','socid','',1); $html->select_societes('','socid','s.fournisseur=0',1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td colspan="2" align="center">'; print '<tr><td colspan="2" align="center">';
print '<input type="hidden" name="action" value="create">'; print '<input type="hidden" name="action" value="create">';
...@@ -824,7 +828,7 @@ elseif ($fichinterid) ...@@ -824,7 +828,7 @@ elseif ($fichinterid)
print "\n"; print "\n";
/** /*
* Barre d'actions * Barre d'actions
*/ */
print '<div class="tabsAction">'; print '<div class="tabsAction">';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment