Skip to content

Commit

Permalink
Merge pull request #8942 from grandoc/new_branch_10_06_2018
Browse files Browse the repository at this point in the history 
New branch 10 06 2018
  • Loading branch information
@eldy
eldy committed Jun 13, 2018
2 parents e69b010 + 5021c7a commit 9164249
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 58 deletions.
12 changes: 0 additions & 12 deletions htdocs/projet/activity/index.php
View file
Expand Up @@ -145,12 +145,10 @@
$resql = $db->query($sql);
if ( $resql )
{
$var=true;
$total=0;

while ($row = $db->fetch_object($resql))
{

print '<tr class="oddeven">';
print '<td>';
$projectstatic->id=$row->rowid;
Expand Down Expand Up @@ -202,12 +200,10 @@
$resql = $db->query($sql);
if ( $resql )
{
$var=true;
$total=0;

while ($row = $db->fetch_object($resql))
{

print '<tr class="oddeven">';
print '<td>';
$projectstatic->id=$row->rowid;
Expand Down Expand Up @@ -263,11 +259,9 @@
if ( $resql )
{
$total = 0;
$var=true;
while ($row = $db->fetch_object($resql))
{
print '<tr class="oddeven">';
print '<td>';
$projectstatic->id=$row->rowid;
Expand Down Expand Up @@ -320,8 +314,6 @@
$resql = $db->query($sql);
if ( $resql )
{
$var=false;

while ($row = $db->fetch_object($resql))
{
print '<tr class="oddeven">';
Expand Down Expand Up @@ -369,7 +361,6 @@
$sql.= " AND p.rowid in (".$projectsListId.")";
$sql.= " GROUP BY p.rowid, p.ref, p.title, p.public";

$var=false;
$resql = $db->query($sql);
if ( $resql )
{
Expand Down Expand Up @@ -463,8 +454,6 @@
$sql.= " ORDER BY t.dateo desc, t.rowid desc, t.datee";
$sql.= $db->plimit($max+1); // We want more to know if we have more than limit

$var=true;

dol_syslog('projet:index.php: affectationpercent', LOG_DEBUG);
$resql = $db->query($sql);
if ( $resql )
Expand Down Expand Up @@ -492,7 +481,6 @@
{
$obj = $db->fetch_object($resql);


$username='';
if ($obj->userid && $userstatic->id != $obj->userid) // We have a user and it is not last loaded user
{
Expand Down
19 changes: 1 addition & 18 deletions htdocs/projet/admin/project.php
View file
Expand Up @@ -2,7 +2,7 @@
/* Copyright (C) 2010-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2011-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2018 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
Expand Down Expand Up @@ -301,7 +301,6 @@

// Main options
$form=new Form($db);
$var=true;

print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
Expand All @@ -313,8 +312,6 @@
print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
print '<td width="80">&nbsp;</td></tr>'."\n";



print '<tr class="oddeven">';
print '<td width="80%">'.$langs->trans("ManageOpportunitiesStatus").'</td>';
print '<td width="60" align="right">';
Expand Down Expand Up @@ -372,8 +369,6 @@
$handle = opendir($dir);
if (is_resource($handle))
{
$var=true;

while (($file = readdir($handle))!==false)
{
if (preg_match('/^(mod_.*)\.php$/i',$file,$reg))
Expand All @@ -391,7 +386,6 @@

if ($module->isEnabled())
{

print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
print $module->info();
print '</td>';
Expand Down Expand Up @@ -476,8 +470,6 @@
$handle = opendir($dir);
if (is_resource($handle))
{
$var=true;

while (($file = readdir($handle))!==false)
{
if (preg_match('/^(mod_.*)\.php$/i',$file,$reg))
Expand All @@ -495,7 +487,6 @@

if ($module->isEnabled())
{

print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
print $module->info();
print '</td>';
Expand Down Expand Up @@ -600,7 +591,6 @@

clearstatcache();

$var=true;
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
Expand Down Expand Up @@ -637,7 +627,6 @@

if ($modulequalified)
{

print '<tr class="oddeven"><td width="100">';
print (empty($module->name)?$name:$module->name);
print "</td><td>\n";
Expand Down Expand Up @@ -759,7 +748,6 @@

clearstatcache();

$var=true;
foreach ($dirmodels as $reldir)
{
foreach (array('','/doc') as $valdir)
Expand Down Expand Up @@ -796,7 +784,6 @@

if ($modulequalified)
{
$var = !$var;
print '<tr class="oddeven"><td width="100">';
print (empty($module->name)?$name:$module->name);
print "</td><td>\n";
Expand Down Expand Up @@ -875,7 +862,6 @@

// Other options
$form=new Form($db);
$var=true;

print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
Expand All @@ -887,8 +873,6 @@
print '<td align="right" width="60">'.$langs->trans("Value").'</td>'."\n";
print '<td width="80">&nbsp;</td></tr>'."\n";



print '<tr class="oddeven">';
print '<td width="80%">'.$langs->trans("UseSearchToSelectProject").'</td>';
if (! $conf->use_javascript_ajax)
Expand All @@ -912,7 +896,6 @@
}
print '</tr>';


print '<tr class="oddeven">';
print '<td>'.$langs->trans("AllowToSelectProjectFromOtherCompany").'</td>';

Expand Down
1 change: 0 additions & 1 deletion htdocs/projet/index.php
View file
Expand Up @@ -265,7 +265,6 @@
$sql.= " GROUP BY s.nom, s.rowid";
$sql.= $db->order($sortfield, $sortorder);

$var=true;
$resql = $db->query($sql);
if ( $resql )
{
Expand Down
5 changes: 2 additions & 3 deletions htdocs/projet/stats/index.php
View file
Expand Up @@ -315,15 +315,14 @@
print '</tr>';

$oldyear=0;
$var=true;
foreach ($data_all_year as $val)
{
$year = $val['year'];
while ($year && $oldyear > $year+1)
{ // If we have empty year
$oldyear--;

print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
{
Expand All @@ -335,7 +334,7 @@
print '</tr>';
}

print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
print '<td align="right">'.$val['nb'].'</td>';
if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES))
Expand Down
5 changes: 2 additions & 3 deletions htdocs/projet/tasks/stats/index.php
View file
Expand Up @@ -174,21 +174,20 @@
print '</tr>';

$oldyear=0;
$var=true;
foreach ($data_all_year as $val)
{
$year = $val['year'];
while ($year && $oldyear > $year+1)
{ // If we have empty year
$oldyear--;

print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$oldyear.'</a></td>';
print '<td align="right">0</td>';
print '</tr>';
}

print '<tr '.$bc[$var].' height="24">';
print '<tr class="oddeven" height="24">';
print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&amp;mode='.$mode.($socid>0?'&socid='.$socid:'').($userid>0?'&userid='.$userid:'').'">'.$year.'</a></td>';
print '<td align="right">'.$val['nb'].'</td>';
print '</tr>';
Expand Down
4 changes: 0 additions & 4 deletions htdocs/resource/list.php
View file
Expand Up @@ -162,10 +162,6 @@
print $form->formconfirm($_SERVER['PHP_SELF']."?element=".$element."&element_id=".$element_id."&lineid=".$lineid,$langs->trans("DeleteResource"),$langs->trans("ConfirmDeleteResourceElement"),"confirm_delete_resource",'','',1);
}



$var=true;

$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);

Expand Down
19 changes: 5 additions & 14 deletions htdocs/societe/consumption.php
View file
Expand Up @@ -68,15 +68,8 @@
$thirdTypeSelect = GETPOST("third_select_id");
$type_element = GETPOST('type_element')?GETPOST('type_element'):'';


$langs->load("companies");
$langs->load("bills");
$langs->load("orders");
$langs->load("suppliers");
$langs->load("propal");
$langs->load("interventions");
$langs->load("contracts");
$langs->load("products");
// Load translation files required by the page
$langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));

// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('consumptionthirdparty'));
Expand Down Expand Up @@ -365,8 +358,7 @@
{
$resql=$db->query($sql);
if (!$resql) dol_print_error($db);

$var=true;

$num = $db->num_rows($resql);

$param="&socid=".$socid."&type_element=".$type_element;
Expand Down Expand Up @@ -433,7 +425,6 @@

if (is_object($documentstaticline)) $documentstaticline->statut=$objp->status;


print '<tr class="oddeven">';
print '<td class="nobordernopadding nowrap" width="100">';
print $documentstatic->getNomUrl(1);
Expand Down Expand Up @@ -643,7 +634,7 @@
print_liste_field_titre('Quantity',$_SERVER['PHP_SELF'],'prod_qty','',$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n";

print '<tr '.$bc[0].'><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';
print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("SelectElementAndClick", $langs->transnoentitiesnoconv("Search")).'</td></tr>';

print "</table>";
}
Expand All @@ -652,7 +643,7 @@

print '<table class="liste" width="100%">'."\n";

print '<tr '.$bc[0].'><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
print '<tr class="oddeven"><td class="opacitymedium" colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';

print "</table>";
}
Expand Down
3 changes: 0 additions & 3 deletions htdocs/user/param_ihm.php
View file
Expand Up @@ -240,7 +240,6 @@ function init_myfunc()
print '<tr class="liste_titre"><td width="25%">'.$langs->trans("Parameter").'</td><td width="25%">'.$langs->trans("DefaultValue").'</td><td>&nbsp;</td><td>'.$langs->trans("PersonalValue").'</td></tr>';

// Landing page

print '<tr class="oddeven"><td>'.$langs->trans("LandingPage").'</td>';
print '<td>';
print (empty($conf->global->MAIN_LANDING_PAGE)?'':$conf->global->MAIN_LANDING_PAGE);
Expand All @@ -254,7 +253,6 @@ function init_myfunc()
print '</td></tr>';

// Langue par defaut

print '<tr class="oddeven"><td>'.$langs->trans("Language").'</td>';
print '<td>';
$s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT);
Expand All @@ -269,7 +267,6 @@ function init_myfunc()
print '</td></tr>';

// Taille max des listes

print '<tr class="oddeven"><td>'.$langs->trans("MaxSizeList").'</td>';
print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>';
print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($object->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"");
Expand Down

0 comments on commit 9164249

Please sign in to comment.