Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into nospaceaftercomma

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-30 18:27:35 +01:00 committed by GitHub
commit e18bd6f986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
254 changed files with 99 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/initdata/generate-order.php
View File

@ -220,4 +220,3 @@ for ($s = 0 ; $s < GEN_NUMBER_COMMANDE ; $s++)
dol_print_error($db, $object->error);
}
}

2
dev/initdata/generate-product.php
View File

@ -96,5 +96,3 @@ for ($s = 0 ; $s < GEN_NUMBER_PRODUIT ; $s++)
if ($ret < 0) print "Error $ret - ".$produit->error."\n";
else print " OK with ref ".$produit->ref."\n";
}

2
dev/initdata/generate-thirdparty.php
View File

@ -127,5 +127,3 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++)
print "Error: ".$soc->error."\n";
}
}

1
dev/initdata/purge-data.php
View File

@ -275,4 +275,3 @@ else
}
$db->close();

4
dev/setup/codesniffer/ruleset.xml
View File

@ -426,4 +426,8 @@
<!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
<rule ref="Zend.Files.ClosingTag"/>
<rule ref="PSR2.Classes.ClassDeclaration" />
<rule ref="PSR2.Methods.FunctionClosingBrace" />
<rule ref="PSR2.Files.EndFileNewline.TooMany" />
</ruleset>

1
dev/translation/sanity_check_en_langfiles.php
View File

@ -388,4 +388,3 @@ if ($web)
}
exit;

2
htdocs/accountancy/admin/account.php
View File

@ -298,7 +298,7 @@ if ($resql)
if (! empty($arrayfields['aa.pcg_type']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="' . $search_pcgtype . '"></td>';
if (! empty($arrayfields['aa.pcg_subtype']['checked'])) print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgsubtype" value="' . $search_pcgsubtype . '"></td>';
if (! empty($arrayfields['aa.active']['checked'])) print '<td class="liste_titre">&nbsp;</td>';
print '<td align="right" class="liste_titre">';
print '<td class="liste_titre right">';
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
print $searchpicto;
print '</td>';

15
htdocs/accountancy/admin/accountmodel.php
View File

@ -517,7 +517,7 @@ if ($id)
// dans les dictionnaires de donnees
$valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
$align="left";
$class="left";
if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
{
@ -576,7 +576,7 @@ if ($id)
fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'add');
}
print '<td colspan="3" align="right">';
print '<td colspan="3" class="right">';
print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
print '</td>';
print "</tr>";
@ -609,7 +609,7 @@ if ($id)
// There is several pages
if ($num > $listlimit)
{
print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
print '<tr class="none"><td class="right" colspan="'.(3+count($fieldlist)).'">';
print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
print '</td></tr>';
}
@ -637,7 +637,7 @@ if ($id)
}
}
print '<td class="liste_titre"></td>';
print '<td class="liste_titre" colspan="2" align="right">';
print '<td class="liste_titre right" colspan="2">';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
@ -650,7 +650,7 @@ if ($id)
// Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees
$showfield=1; // By defaut
$align="left";
$class="left";
$sortable=1;
$valuetoshow='';
/*
@ -705,7 +705,7 @@ if ($id)
if (empty($reshook)) fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'edit');
print '<td colspan="3" align="right"><a name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '<td colspan="3" class="right"><a name="'.(! empty($obj->rowid)?$obj->rowid:$obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
}
else
@ -722,7 +722,7 @@ if ($id)
{
$showfield=1;
$align="left";
$class="left";
$valuetoshow=$obj->{$fieldlist[$field]};
if ($value == 'type_template')
{
@ -877,4 +877,3 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
}
}
}

11
htdocs/accountancy/admin/categories_list.php
View File

@ -467,7 +467,7 @@ if ($id)
// dans les dictionnaires de donnees
$valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
$align="left";
$class="left";
if ($fieldlist[$field]=='type') {
if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow=$form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
else $valuetoshow=$langs->trans("Type");
@ -531,7 +531,7 @@ if ($id)
fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
}
print '<td colspan="4" align="right">';
print '<td colspan="4" class="right">';
print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
print '</td>';
print "</tr>";
@ -559,7 +559,7 @@ if ($id)
// There is several pages
if ($num > $listlimit)
{
print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
print '<tr class="none"><td class="right" colspan="'.(3+count($fieldlist)).'">';
print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
print '</td></tr>';
}
@ -607,7 +607,7 @@ if ($id)
// Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees
$showfield=1; // By defaut
$align="left";
$class="left";
$sortable=1;
$valuetoshow='';
@ -693,7 +693,7 @@ if ($id)
{
$showfield=1;
$align="left";
$class="left";
$valuetoshow=$obj->{$fieldlist[$field]};
if ($value == 'category_type')
{
@ -873,4 +873,3 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
}
}
}

4
htdocs/accountancy/admin/defaultaccounts.php
View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013-2018 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2013-2019 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2014-2015 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
@ -55,6 +55,8 @@ $list_account_main = array (
$list_account = array (
'ACCOUNTING_PRODUCT_BUY_ACCOUNT',
'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',
'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',
'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',
'ACCOUNTING_SERVICE_BUY_ACCOUNT',
'ACCOUNTING_SERVICE_SOLD_ACCOUNT',
'ACCOUNTING_VAT_BUY_ACCOUNT',

10
htdocs/accountancy/admin/journals_list.php
View File

@ -429,7 +429,7 @@ if ($id)
// dans les dictionnaires de donnees
$valuetoshow=ucfirst($fieldlist[$field]); // Par defaut
$valuetoshow=$langs->trans($valuetoshow); // try to translate
$align="left";
$class="left";
if ($fieldlist[$field]=='code') { $valuetoshow=$langs->trans("Code"); }
if ($fieldlist[$field]=='libelle' || $fieldlist[$field]=='label')
{
@ -480,7 +480,7 @@ if ($id)
fieldListJournal($fieldlist, $obj, $tabname[$id], 'add');
}
print '<td colspan="4" align="right">';
print '<td colspan="4" class="right">';
print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
print '</td>';
print "</tr>";
@ -508,7 +508,7 @@ if ($id)
// There is several pages
if ($num > $listlimit)
{
print '<tr class="none"><td align="right" colspan="'.(3+count($fieldlist)).'">';
print '<tr class="none"><td class="right" colspan="'.(3+count($fieldlist)).'">';
print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page+1).'</span></li>');
print '</td></tr>';
}
@ -537,7 +537,7 @@ if ($id)
// Determine le nom du champ par rapport aux noms possibles
// dans les dictionnaires de donnees
$showfield=1; // By defaut
$align="left";
$class="left";
$sortable=1;
$valuetoshow='';
/*
@ -606,7 +606,7 @@ if ($id)
{
$showfield=1;
$align="left";
$class="left";
$valuetoshow=$obj->{$fieldlist[$field]};
if ($valuetoshow=='all') {
$valuetoshow=$langs->trans('All');

14
htdocs/accountancy/bookkeeping/balance.php
View File

@ -235,7 +235,7 @@ if ($action != 'export_csv')
print $langs->trans('to');
print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, '');
print '</td>';
print '<td align="right" class="liste_titre">';
print '<td class="liste_titre right">';
$searchpicto=$form->showFilterAndCheckAddButtons(0);
print $searchpicto;
print '</td>';
@ -245,9 +245,9 @@ if ($action != 'export_csv')
print '<tr class="liste_titre">';
print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("Label", $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'align="right"', $sortfield, $sortorder);
print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
print_liste_field_titre('', $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
print "</tr>\n";
@ -274,7 +274,7 @@ if ($action != 'export_csv')
{
// Affiche un Sous-Total par compte comptable
if ($displayed_account != "") {
print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
print "<td>&nbsp;</td>\n";
print '</tr>';
}
@ -305,11 +305,11 @@ if ($action != 'export_csv')
$sous_total_credit += $line->credit;
}
print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap" align="right">' . price($sous_total_debit) . '</td><td class="nowrap" align="right">' . price($sous_total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("SubTotal") . ':</td><td class="nowrap right">' . price($sous_total_debit) . '</td><td class="nowrap right">' . price($sous_total_credit) . '</td><td class="nowrap right">' . price(price2num($sous_total_credit - $sous_total_debit)) . '</td>';
print "<td>&nbsp;</td>\n";
print '</tr>';
print '<tr class="liste_total"><td align="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap" align="right">' . price($total_debit) . '</td><td class="nowrap" align="right">' . price($total_credit) . '</td><td class="nowrap" align="right">' . price(price2num($total_credit - $total_debit)) . '</td>';
print '<tr class="liste_total"><td class="right" colspan="2">' . $langs->trans("AccountBalance") . ':</td><td class="nowrap right">' . price($total_debit) . '</td><td class="nowrap right">' . price($total_credit) . '</td><td class="nowrap right">' . price(price2num($total_credit - $total_debit)) . '</td>';
print "<td>&nbsp;</td>\n";
print '</tr>';

26
htdocs/accountancy/bookkeeping/balancebymonth.php
View File

@ -117,19 +117,19 @@ if ($resql) {
$row = $db->fetch_row($resql);
print '<tr class="oddeven"><td width="14%">' . length_accountg($row[0]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[1]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[2]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[3]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[4]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[5]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[6]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[7]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[8]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[9]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[10]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[11]) . '</td>';
print '<td align="right" width="6.5%">' . price($row[12]) . '</td>';
print '<td align="right" width="8%"><strong>' . price($row[13]) . '</strong></td>';
print '<td class="right" width="6.5%">' . price($row[1]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[2]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[3]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[4]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[5]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[6]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[7]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[8]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[9]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[10]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[11]) . '</td>';
print '<td class="right" width="6.5%">' . price($row[12]) . '</td>';
print '<td class="right" width="8%"><strong>' . price($row[13]) . '</strong></td>';
print '</tr>';
$i ++;

1
htdocs/accountancy/class/lettering.class.php
View File

@ -314,4 +314,3 @@ class Lettering extends BookKeeping
}
}
}

1
htdocs/admin/dict.php
View File

@ -1990,4 +1990,3 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
return $withentity;
}

1
htdocs/admin/ldap_contacts.php
View File

@ -321,4 +321,3 @@ if (function_exists("ldap_connect"))
// End of page
llxFooter();
$db->close();

1
htdocs/admin/livraison.php
View File

@ -481,4 +481,3 @@ print '</table>';
// End of page
llxFooter();
$db->close();

1
htdocs/admin/mails_templates.php
View File

@ -1065,4 +1065,3 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
}
}
}

1
htdocs/admin/supplier_proposal.php
View File

@ -585,4 +585,3 @@ print "</table>\n<br>";
// End of page
llxFooter();
$db->close();

1
htdocs/admin/tools/export.php
View File

@ -234,4 +234,3 @@ header("Location: dolibarr_export.php");
$time_end = time();
$db->close();

1
htdocs/admin/tools/export_files.php
View File

@ -163,4 +163,3 @@ header("Location: dolibarr_export.php");
$time_end = time();
$db->close();

1
htdocs/admin/website.php
View File

@ -695,4 +695,3 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
}
}
}

1
htdocs/admin/website_options.php
View File

@ -147,4 +147,3 @@ dol_fiche_end();
// End of page
llxFooter();
$db->close();

1
htdocs/api/admin/explorer.php
View File

@ -221,4 +221,3 @@ print $langs->trans("OnlyActiveElementsAreExposed", DOL_URL_ROOT.'/admin/modules
llxFooter();
$db->close();

2
htdocs/blockedlog/ajax/authority.php
View File

@ -69,5 +69,3 @@ elseif(!empty($newblock)){
else{
echo 'idontunderstandwhatihavetodo';
}

1
htdocs/bookmarks/bookmarks.lib.php
View File

@ -150,4 +150,3 @@ function printBookmarksList($aDb, $aLangs)
return $ret;
}

2
htdocs/bookmarks/list.php
View File

@ -212,5 +212,3 @@ else
// End of page
llxFooter();
$db->close();

1
htdocs/cashdesk/class/Auth.class.php
View File

@ -139,4 +139,3 @@ class Auth
return $ret;
}
}

1
htdocs/cashdesk/deconnexion.php
View File

@ -34,4 +34,3 @@ unset($_SESSION['uid']);
header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php');
exit;

1
htdocs/cashdesk/facturation_verif.php
View File

@ -233,4 +233,3 @@ $_SESSION['serObjFacturation'] = serialize($obj_facturation);
//var_dump($_SESSION['serObjFacturation']);
header('Location: '.$redirection);
exit;

1
htdocs/cashdesk/include/environnement.php
View File

@ -49,4 +49,3 @@ $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes
// Add hidden option to force decrease of stock whatever is user setup
if (! empty($conf->global->CASHDESK_FORCE_STOCK_ON_BILL)) $conf->global->STOCK_CALCULATE_ON_BILL=1;

1
htdocs/cashdesk/index_verif.php
View File

@ -140,4 +140,3 @@ else
header('Location: '.DOL_URL_ROOT.'/cashdesk/index.php?err='.urlencode($retour).'&user='.$username.'&socid='.$thirdpartyid.'&warehouseid='.$warehouseid);
exit;
}

1
htdocs/cashdesk/validation.php
View File

@ -25,4 +25,3 @@ $form=new Form($db);
// Affichage des templates
require 'tpl/validation1.tpl.php';

1
htdocs/cashdesk/validation_ok.php
View File

@ -23,4 +23,3 @@
// Affichage des templates
require 'tpl/validation2.tpl.php';

1
htdocs/cashdesk/validation_ticket.php
View File

@ -40,4 +40,3 @@ if (empty($reshook))
$_SESSION['serObjFacturation'] = serialize($obj_facturation);

1
htdocs/commande/class/commandestats.class.php
View File

@ -223,4 +223,3 @@ class CommandeStats extends Stats
return $this->_getAllByProduct($sql);
}
}

1
htdocs/commande/customer.php
View File

@ -193,4 +193,3 @@ else
// End of page
llxFooter();
$db->close();

1
htdocs/compta/deplacement/class/deplacementstats.class.php
View File

@ -166,4 +166,3 @@ class DeplacementStats extends Stats
return $this->_getAllByYear($sql);
}
}

1
htdocs/compta/facture/class/facturestats.class.php
View File

@ -225,4 +225,3 @@ class FactureStats extends Stats
return $this->_getAllByProduct($sql);
}
}

1
htdocs/compta/prelevement/stats.php
View File

@ -228,4 +228,3 @@ else
// End of page
llxFooter();
$db->close();

1
htdocs/compta/salaries/class/salariesstats.class.php
View File

@ -164,4 +164,3 @@ class SalariesStats extends Stats
return $this->_getAllByYear($sql);
}
}

1
htdocs/core/actions_builddoc.inc.php
View File

@ -134,4 +134,3 @@ if ($action == 'remove_file' && $permissioncreate)
header('Location: '.$urltoredirect);
exit;
}

2
htdocs/core/actions_changeselectedfields.inc.php
View File

@ -44,5 +44,3 @@ if (GETPOST('formfilteraction') == 'listafterchangingselectedfields')
//$action='list';
//var_dump($tabparam);exit;
}

1
htdocs/core/actions_dellink.inc.php
View File

@ -43,4 +43,3 @@ if ($action == 'dellink' && ! empty($permissiondellink) && ! GETPOST('cancel', '
$result=$object->deleteObjectLinked(0, '', 0, '', $dellinkid);
if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
}

1
htdocs/core/actions_extrafields.inc.php
View File

@ -402,4 +402,3 @@ if ($action == 'delete')
$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("AttributeCode"));
}
}

1
htdocs/core/actions_lineupdown.inc.php
View File

@ -70,4 +70,3 @@ if ($action == 'down' && $permissiontoedit)
header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
exit();
}

3
htdocs/core/actions_massactions.inc.php
View File

@ -1262,6 +1262,3 @@ $parameters['uploaddir']=$uploaddir;
$reshook=$hookmanager->executeHooks('doMassActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

1
htdocs/core/actions_setmoduleoptions.inc.php
View File

@ -114,4 +114,3 @@ if ($action == 'setModuleOptions')
if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
}
}

1
htdocs/core/ajax/ajaxdirtree.php
View File

@ -491,4 +491,3 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
else print "PermissionDenied";
}
}

1
htdocs/core/ajax/bankconciliate.php
View File

@ -94,4 +94,3 @@ if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $
exit;
}

1
htdocs/core/ajax/box.php
View File

@ -77,4 +77,3 @@ if ($boxorder && $zone != '' && $userid > 0)
}
}
}

1
htdocs/core/ajax/check_notifications.php
View File

@ -116,4 +116,3 @@ if ($time >= $_SESSION['auto_check_events_not_before'])
}
print json_encode($eventfound);

1
htdocs/core/ajax/constantonoff.php
View File

@ -64,4 +64,3 @@ if (! empty($action) && ! empty($name))
}
}
}

1
htdocs/core/ajax/contacts.php
View File

@ -54,4 +54,3 @@ if (! empty($id) && ! empty($action) && ! empty($htmlname))
echo json_encode($return);
}

1
htdocs/core/ajax/extraparams.php
View File

@ -74,4 +74,3 @@ if(! empty($id) && ! empty($element) && ! empty($htmlelement) && ! empty($type))
$result=$object->setExtraParameters();
}

1
htdocs/core/ajax/fileupload.php
View File

@ -73,4 +73,3 @@ switch ($_SERVER['REQUEST_METHOD']) {
}
$db->close();

1
htdocs/core/ajax/getaccountcurrency.php
View File

@ -54,4 +54,3 @@ if (! empty($id))
echo json_encode($return);
}

1
htdocs/core/ajax/loadinplace.php
View File

@ -112,4 +112,3 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
echo $langs->transnoentities('NotEnoughPermissions');
}
}

1
htdocs/core/ajax/price.php
View File

@ -63,4 +63,3 @@ if (! empty($output) && isset($amount) && isset($tva_tx))
echo json_encode($return);
}

1
htdocs/core/ajax/row.php
View File

@ -73,4 +73,3 @@ if ((! empty($_POST['roworder'])) && (! empty($_POST['table_element_line']))
$result=$row->line_order(true);
}
}

1
htdocs/core/ajax/saveinplace.php
View File

@ -229,4 +229,3 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
echo $langs->trans('NotEnoughPermissions');
}
}

1
htdocs/core/ajax/security.php
View File

@ -49,4 +49,3 @@ if (isset($_GET['action']) && ! empty($_GET['action']))
echo getRandomPassword($generic);
}
}

1
htdocs/core/ajax/selectsearchbox.php
View File

@ -170,4 +170,3 @@ if (! isset($usedbyinclude) || empty($usedbyinclude))
print json_encode($arrayresult);
if (is_object($db)) $db->close();
}

1
htdocs/core/ajax/vatrates.php
View File

@ -67,4 +67,3 @@ if (! empty($id) && ! empty($action) && ! empty($htmlname))
echo json_encode($return);
}

1
htdocs/core/ajax/ziptown.php
View File

@ -135,4 +135,3 @@ else
}
$db->close();

1
htdocs/core/antispamimage.php
View File

@ -65,4 +65,3 @@ $background_color = imagecolorallocate($img, 250, 250, 250);
$ecriture_color = imagecolorallocate($img, 0, 0, 0);
imagestring($img, 4, 24, 8, $string, $ecriture_color);
imagepng($img);

1
htdocs/core/boxes/box_actions.php
View File

@ -260,4 +260,3 @@ class box_actions extends ModeleBoxes
return '';
}
}

1
htdocs/core/boxes/box_bookmarks.php
View File

@ -162,4 +162,3 @@ class box_bookmarks extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_clients.php
View File

@ -178,4 +178,3 @@ class box_clients extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_commandes.php
View File

@ -203,4 +203,3 @@ class box_commandes extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_comptes.php
View File

@ -189,4 +189,3 @@ class box_comptes extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_contacts.php
View File

@ -190,4 +190,3 @@ class box_contacts extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_contracts.php
View File

@ -194,4 +194,3 @@ class box_contracts extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_external_rss.php
View File

@ -200,4 +200,3 @@ class box_external_rss extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_factures_fourn.php
View File

@ -219,4 +219,3 @@ class box_factures_fourn extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_factures_fourn_imp.php
View File

@ -206,4 +206,3 @@ class box_factures_fourn_imp extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_ficheinter.php
View File

@ -171,4 +171,3 @@ class box_ficheinter extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_fournisseurs.php
View File

@ -165,4 +165,3 @@ class box_fournisseurs extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_goodcustomers.php
View File

@ -174,4 +174,3 @@ class box_goodcustomers extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_invoices_permonth.php
View File

@ -280,4 +280,3 @@ class box_graph_invoices_permonth extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
View File

@ -279,4 +279,3 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_orders_permonth.php
View File

@ -278,4 +278,3 @@ class box_graph_orders_permonth extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
View File

@ -277,4 +277,3 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_product_distribution.php
View File

@ -417,4 +417,3 @@ class box_graph_product_distribution extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_graph_propales_permonth.php
View File

@ -281,4 +281,3 @@ class box_graph_propales_permonth extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_members.php
View File

@ -183,4 +183,3 @@ class box_members extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_produits.php
View File

@ -231,4 +231,3 @@ class box_produits extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_produits_alerte_stock.php
View File

@ -243,4 +243,3 @@ class box_produits_alerte_stock extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_project.php
View File

@ -200,4 +200,3 @@ class box_project extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_propales.php
View File

@ -193,4 +193,3 @@ class box_propales extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_prospect.php
View File

@ -181,4 +181,3 @@ class box_prospect extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_services_contracts.php
View File

@ -246,4 +246,3 @@ class box_services_contracts extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_services_expired.php
View File

@ -190,4 +190,3 @@ class box_services_expired extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

1
htdocs/core/boxes/box_supplier_orders.php
View File

@ -189,4 +189,3 @@ class box_supplier_orders extends ModeleBoxes
return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
}
}

16
htdocs/core/boxes/box_task.php
View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2012-2018 Charlene BENKE <charlie@patas-monkey.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
* Copyright (C) 2015-2019 Frederic France <frederic.france@netlogic.fr>
*
* 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
@ -104,12 +104,10 @@ class box_task extends ModeleBoxes
$sql.= $db->plimit($max, 0);
$result = $db->query($sql);
if ($result)
{
$i = 0;
if ($result) {
$num = $db->num_rows($result);
$i = 0;
while ($i < $num)
{
while ($i < $num) {
$objp = $db->fetch_object($result);
$this->info_box_contents[$i][] = array(
'td' => '',
@ -131,11 +129,11 @@ class box_task extends ModeleBoxes
$i++;
}
}
else dol_print_error($this->db);
} else {
dol_print_error($this->db);
}
}
// Add the sum at the bottom of the boxes
$this->info_box_contents[$i][] = array('tr' => 'class="liste_total"', 'td' => '', 'text' => $langs->trans("Total")."&nbsp;".$textHead);
$this->info_box_contents[$i][] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')."&nbsp;".$langs->trans("Tasks"));

2
htdocs/core/boxes/modules_boxes.php
View File

@ -503,5 +503,3 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
return $widget;
}
}

1
htdocs/core/class/commonorder.class.php
View File

@ -145,4 +145,3 @@ abstract class CommonOrderLine extends CommonObjectLine
public $special_code = 0;
}

1
htdocs/core/class/conf.class.php
View File

@ -694,4 +694,3 @@ class Conf
}
}
}

1
htdocs/core/class/html.formbank.class.php
View File

@ -79,4 +79,3 @@ class FormBank
return 'IBANNumber';
}
}

1
htdocs/core/class/html.formmargin.class.php
View File

@ -281,4 +281,3 @@ class FormMargin
print '</div>';
}
}

Some files were not shown because too many files have changed in this diff Show More