Skip to content

Commit

Permalink
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into d…
Browse files Browse the repository at this point in the history 
…evelop
  • Loading branch information
@eldy
eldy committed May 5, 2017
2 parents f069ef9 + aa8aa56 commit fecf5ef
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 45 deletions.
4 changes: 1 addition & 3 deletions htdocs/admin/loan.php
View file
Expand Up @@ -96,9 +96,7 @@

foreach ($list as $key)
{


print '<tr '.$bc[$var].' class="value">';
print '<tr class="oddeven value">';

// Param
$label = $langs->trans($key);
Expand Down
9 changes: 4 additions & 5 deletions htdocs/admin/mails_templates.php
View file
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2017 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011 Remy Younes <ryounes@gmail.com>
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@ltairis.fr>
Expand Down Expand Up @@ -659,11 +659,10 @@
// Lines with values
while ($i < $num)
{
$var = ! $var;

$obj = $db->fetch_object($resql);
//print_r($obj);
print '<tr '.$bc[$var].' id="rowid-'.$obj->rowid.'">';
print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
if ($action == 'edit' && ($rowid == (! empty($obj->rowid)?$obj->rowid:$obj->code)))
{
$tmpaction='edit';
Expand Down Expand Up @@ -697,7 +696,7 @@
// Show value for field
if ($showfield) {

print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$rowid.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
$okforextended = true;
if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
$okforextended = false;
Expand Down Expand Up @@ -789,7 +788,7 @@
// Show value for field
if ($showfield) {
print '</tr><tr '.$bc[$var].' nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
print '</tr><tr class="oddeven" nohover tr-'.$tmpfieldlist.'-'.$i.' "><td colspan="5">'; // To create an artificial CR for the current tr we are on
$okforextended = true;
if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
$okforextended = false;
Expand Down
6 changes: 2 additions & 4 deletions htdocs/admin/modules.php
View file
Expand Up @@ -428,8 +428,6 @@
print "<br>\n";


$var=true;

if ($mode == 'common')
{

Expand Down Expand Up @@ -782,15 +780,15 @@
print '</tr>';


print "<tr ".$bc[$var].">\n";
print "<tr class=\"oddeven\">\n";
$url='https://www.dolistore.com';
print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
print '<td>'.$langs->trans("DoliStoreDesc").'</td>';
print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
print '</tr>';


print "<tr ".$bc[$var].">\n";
print "<tr class=\"oddeven\">\n";
$url='https://partners.dolibarr.org';
print '<td align="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner_int.png"></a></td>';
print '<td>'.$langs->trans("DoliPartnersDesc").'</td>';
Expand Down
13 changes: 4 additions & 9 deletions htdocs/admin/oauth.php
View file
Expand Up @@ -93,7 +93,6 @@

print '<table class="noborder" width="100%">';

$var = true;
$i=0;

foreach ($list as $key)
Expand All @@ -116,31 +115,27 @@
if ($supported)
{
$redirect_uri=$urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$key[0]].'_oauthcallback.php';
$var = !$var;
print '<tr '.$bc[$var].' class="value">';
print '<tr class="oddeven value">';
print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
print '<td><input style="width: 80%" type"text" name="uri'.$key[0].'" value="'.$redirect_uri.'">';
print '</td></tr>';
}
else
{
$var = !$var;
print '<tr '.$bc[$var].' class="value">';
print '<tr class="oddeven value">';
print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
print '<td>'.$langs->trans("FeatureNotYetSupported").'</td>';
print '</td></tr>';
}

// Api Id
$var = !$var;
print '<tr '.$bc[$var].' class="value">';
print '<tr class="oddeven value">';
print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
print '</td></tr>';

// Api Secret
$var = !$var;
print '<tr '.$bc[$var].' class="value">';
print '<tr class="oddeven value">';
print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
print '</td></tr>';
Expand Down
4 changes: 1 addition & 3 deletions htdocs/admin/perms.php
View file
Expand Up @@ -140,7 +140,6 @@
{
$num = $db->num_rows($result);
$i = 0;
$var = True;
$oldmod = "";

while ($i < $num)
Expand Down Expand Up @@ -187,8 +186,7 @@
}


print '<tr '. $bc[$var].'>';

print '<tr class="oddeven">';
print '<td>'.img_object('',$picto).' '.$objMod->getName();
print '<a name="'.$objMod->getName().'">&nbsp;</a>';

Expand Down
2 changes: 1 addition & 1 deletion htdocs/admin/salaries.php
View file
Expand Up @@ -99,7 +99,7 @@
{


print '<tr '.$bc[$var].' class="value">';
print '<tr class="oddeven value">';

// Param
$label = $langs->trans($key);
Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/supplier_invoice.php
View file
Expand Up @@ -5,7 +5,7 @@
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2017 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -361,7 +361,6 @@

if (is_dir($dir))
{
$var=true;

$handle=opendir($dir);

Expand All @@ -379,7 +378,7 @@
$module = new $classname($db, new FactureFournisseur($db));


print "<tr ".$bc[$var].">\n";
print "<tr class=\"oddeven\">\n";
print "<td>";
print (empty($module->name)?$name:$module->name);
print "</td>\n";
Expand Down
5 changes: 2 additions & 3 deletions htdocs/admin/supplier_order.php
View file
Expand Up @@ -5,7 +5,7 @@
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011-2015 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011-2017 Philippe Grand <philippe.grand@atoo-net.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -382,7 +382,6 @@

clearstatcache();

$var=true;
foreach ($dirmodels as $reldir)
{
$dir = dol_buildpath($reldir."core/modules/supplier_order/pdf/");
Expand All @@ -403,7 +402,7 @@
$module = new $classname($db, new CommandeFournisseur($db));


print "<tr ".$bc[$var].">\n";
print "<tr class=\"oddeven\">\n";
print "<td>";
print (empty($module->name)?$name:$module->name);
print "</td>\n";
Expand Down
3 changes: 1 addition & 2 deletions htdocs/admin/supplier_payment.php
View file
Expand Up @@ -367,7 +367,6 @@

if (is_dir($dir))
{
$var=true;

$handle=opendir($dir);

Expand All @@ -385,7 +384,7 @@
$module = new $classname($db, new PaiementFourn($db));


print "<tr ".$bc[$var].">\n";
print "<tr class=\"oddeven\">\n";
print "<td>";
print (empty($module->name)?$name:$module->name);
print "</td>\n";
Expand Down
3 changes: 1 addition & 2 deletions htdocs/admin/syslog.php
View file
Expand Up @@ -197,7 +197,6 @@
print '<td>'.$langs->trans("Type").'</td><td>'.$langs->trans("Value").'</td>';
print '<td align="right" colspan="2"><input type="submit" class="button" '.$option.' value="'.$langs->trans("Modify").'"></td>';
print "</tr>\n";
$var=true;

foreach ($syslogModules as $moduleName)
{
Expand All @@ -210,7 +209,7 @@

print '<tr class="oddeven">';
print '<td width="140">';
print '<input '.$bc[$var].' type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
print '<input class="oddeven" type="checkbox" name="SYSLOG_HANDLERS[]" value="'.$moduleName.'" '.(in_array($moduleName, $activeModules) ? 'checked' : '').($moduleactive <= 0 ? 'disabled' : '').'> ';
print $module->getName();
print '</td>';

Expand Down
10 changes: 5 additions & 5 deletions htdocs/admin/taxes.php
View file
Expand Up @@ -136,10 +136,10 @@
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans('OptionVatMode').'</td><td>'.$langs->trans('Description').'</td>';
print "</tr>\n";
print '<tr '.$bc[false].'><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="0"'.($tax_mode != 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDefault').'</td>';
print '<td colspan="2">'.nl2br($langs->trans('OptionVatDefaultDesc'));
print "</td></tr>\n";
print '<tr '.$bc[true].'><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
print '<tr class="oddeven"><td width="200"><input type="radio" name="tax_mode" value="1"'.($tax_mode == 1 ? ' checked' : '').'> '.$langs->trans('OptionVATDebitOption').'</td>';
print '<td colspan="2">'.nl2br($langs->trans('OptionVatDebitOptionDesc'))."</td></tr>\n";

print "</table>\n";
Expand All @@ -152,7 +152,7 @@
print '<tr class="liste_titre"><td>&nbsp;</td><td>'.$langs->trans("Buy").'</td><td>'.$langs->trans("Sell").'</td></tr>';

// Products
print '<tr '.$bc[false].'><td>'.$langs->trans("Product").'</td>';
print '<tr class="oddeven"><td>'.$langs->trans("Product").'</td>';
print '<td>';
print $langs->trans("OnDelivery");
print ' ('.$langs->trans("SupposedToBeInvoiceDate").')';
Expand All @@ -163,7 +163,7 @@
print '</td></tr>';

// Services
print '<tr '.$bc[true].'><td>'.$langs->trans("Services").'</td>';
print '<tr class="oddeven"><td>'.$langs->trans("Services").'</td>';
print '<td>';
if ($tax_mode == 0)
{
Expand Down Expand Up @@ -206,7 +206,7 @@
{


print '<tr '.$bc[$var].' class="value">';
print '<tr class="oddeven value">';

// Param
$label = $langs->trans($key);
Expand Down
2 changes: 0 additions & 2 deletions htdocs/admin/websites.php
View file
Expand Up @@ -441,7 +441,6 @@
{
$num = $db->num_rows($resql);
$i = 0;
$var=true;
if ($num)
{
print '<br>';
Expand Down Expand Up @@ -499,7 +498,6 @@
// Lines with values
while ($i < $num)
{
$var = ! $var;

$obj = $db->fetch_object($resql);
//print_r($obj);
Expand Down
3 changes: 1 addition & 2 deletions htdocs/admin/workflow.php
View file
Expand Up @@ -120,8 +120,7 @@
$oldfamily = $family;
}

$var = !$var;
print "<tr ".$bc[$var].">\n";
print "<tr class=\"oddeven\">\n";
print "<td>".img_object('', $picto).$langs->trans('desc'.$key);
if (! empty($params['warning']))
{
Expand Down
3 changes: 2 additions & 1 deletion htdocs/compta/facture/fiche-rec.php
View file
Expand Up @@ -35,8 +35,9 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
if (! empty($conf->projet->enabled)) {
require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
//require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
}
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';

Expand Down

0 comments on commit fecf5ef

Please sign in to comment.