scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge avant mise en production

Browse Source
This commit is contained in:
Michael RICOIS 2010-11-19 15:57:23 +00:00
commit 72258a7807
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/infogreffe/infogreffe_courrier.php
View File

@ -15,10 +15,24 @@ $dejaCommande = false;
$noemail = false; $noemail = false;
$sameLogin = false; $sameLogin = false;
$idCommande = 0; $idCommande = 0;
//Vérification des commandes //Vérification des commandes
if (preg_match('/^([0-9]{4})[_sociaux-|_-]/', $ref, $matches))
{
$searchRef = '^'.$matches[1].'[_-|_sociaux-]';
}
elseif (preg_match('/^([0-9]{4})_consolide-/', $ref, $matches))
{
$searchRef = '^'.$matches[1].'_consolide-';
}
else
{
$searchRef = $ref;
}
$rep = mysql_select('commandes', $rep = mysql_select('commandes',
' idCommande, login, emailCommande, dateCommande', ' idCommande, login, emailCommande, dateCommande',
"siren=$siren AND refDocument='$ref'"); "siren=$siren AND refDocument='$searchRef'");
//Fichier de vérouillage commande en cours //Fichier de vérouillage commande en cours
$lockFile = PATH_SITE.'/cache/'.$siren.'-'.$ref.'.txt'; $lockFile = PATH_SITE.'/cache/'.$siren.'-'.$ref.'.txt';

2
www/pages/liasse.php
View File

@ -97,7 +97,7 @@ foreach($tabUnit as $unit)
</tr> </tr>
<?php <?php
//Exportation excel //Exportation excel
if(isset($_REQUEST['mil'])) if(isset($_REQUEST['mil']) && $_SESSION['tabInfo']['idClient']==1)
{ {
?> ?>
<tr> <tr>