lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8783 from grandoc/new_branch_12_05_2018

Browse Source 
Clean and update code
This commit is contained in:
Laurent Destailleur 2018-05-18 08:56:06 +02:00 committed by GitHub
commit c9d23d3930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/bookmarks/admin/bookmark.php
View File

@ -68,8 +68,6 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setvalue">';
$var=true;
print '<table summary="bookmarklist" class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Name").'</td>';

7
htdocs/cashdesk/admin/cashdesk.php
View File

@ -38,8 +38,8 @@ if (! empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id']))
if (!$user->admin)
accessforbidden();
$langs->load("admin");
$langs->load("cashdesk");
// Load traductions files requiredby by page
$langs->loadLangs(array("admin", "cashdesk"));
/*
@ -91,7 +91,6 @@ print '<br>';
// Mode
$var=true;
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="set">';
@ -162,7 +161,6 @@ if (! empty($conf->stock->enabled))
if (! empty($conf->service->enabled))
{
$var=! $var;
print '<tr class="oddeven"><td>';
print $langs->trans("CashdeskShowServices");
print '<td colspan="2">';
@ -173,7 +171,6 @@ if (! empty($conf->service->enabled))
// Use Dolibarr Receipt Printer
if (! empty($conf->receiptprinter->enabled))
{
$var=! $var;
print '<tr class="oddeven"><td>';
print $langs->trans("DolibarrReceiptPrinter").' ('.$langs->trans("FeatureNotYetAvailable").')';
print '<td colspan="2">';

1
htdocs/categories/admin/categorie.php
View File

@ -93,7 +93,6 @@ print '<td align="center" width="20">&nbsp;</td>';
print '<td align="center" width="100">'.$langs->trans("Value").'</td>'."\n";
print '</tr>';
$var=true;
$form = new Form($db);
// Mail required for members

3
htdocs/categories/index.php
View File

@ -82,7 +82,7 @@ print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="3">'.$langs->trans("Search").'</td>';
print '</tr>';
print '<tr '.$bc[0].'><td>';
print '<tr class="oddeven"><td>';
print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="' . $catname . '"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
/*
// faire une rech dans une sous categorie uniquement
@ -111,7 +111,6 @@ if ($catname || $id > 0)
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("FoundCats").'</td></tr>';
$var=true;
foreach ($cats as $cat)
{
print "\t".'<tr class="oddeven">'."\n";

9
htdocs/comm/action/card.php
View File

@ -42,12 +42,8 @@ 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/extrafields.class.php';
$langs->load("companies");
$langs->load("commercial");
$langs->load("other");
$langs->load("bills");
$langs->load("orders");
$langs->load("agenda");
// Load traductions files requiredby by page
$langs->loadLangs(array("companies", "other", "commercial", "bills", "orders", "agenda"));
$action=GETPOST('action','alpha');
$cancel=GETPOST('cancel','alpha');
@ -1603,7 +1599,6 @@ if ($id > 0)
$genallowed=$user->rights->agenda->myactions->read;
$delallowed=$user->rights->agenda->myactions->create;
$var=true;
print $formfile->showdocuments('agenda',$object->id,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,0,0,'','','',$object->default_lang);

5
htdocs/comm/action/rapport/index.php
View File

@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/modules/action/rapport.pdf.php';
$langs->load("agenda");
$langs->load("commercial");
// Load traductions files requiredby by page
$langs->loadLangs(array("agenda", "commercial"));
$action=GETPOST('action','alpha');
$month=GETPOST('month');
@ -138,7 +138,6 @@ if ($resql)
print '<td align="center">'.$langs->trans("Size").'</td>';
print "</tr>\n";
$var=true;
while ($i < min($num,$limit))
{
$obj=$db->fetch_object($resql);