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

Merge remote-tracking branch 'upstream/develop' into variant

Browse Source
This commit is contained in:
Frédéric FRANCE 2018-08-07 16:55:50 +02:00
commit cb53366955
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
540 changed files with 1205 additions and 1070 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/generate_filelist_xml.php
View File

@ -34,8 +34,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
exit;
}
require_once($path."../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
require_once $path."../htdocs/master.inc.php";
require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
/*

4
dev/examples/code/create_invoice.php
View File

@ -40,7 +40,7 @@ $error=0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once($path."../../htdocs/master.inc.php");
require_once $path."../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@ -58,7 +58,7 @@ print "***** ".$script_file." (".$version.") *****\n";
// Start of transaction
$db->begin();
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
// Create invoice object
$obj = new Facture($db);

4
dev/examples/code/create_order.php
View File

@ -40,7 +40,7 @@ $error=0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once($path."../../htdocs/master.inc.php");
require_once $path."../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n";
// Start of transaction
$db->begin();
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
// Create order object
$com = new Commande($db);

4
dev/examples/code/create_product.php
View File

@ -40,7 +40,7 @@ $error=0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once($path."../../htdocs/master.inc.php");
require_once $path."../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@ -59,7 +59,7 @@ print "***** ".$script_file." (".$version.") *****\n";
// Start of transaction
$db->begin();
require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
// Create instance of object
$myproduct=new Product($db);

4
dev/examples/code/create_user.php
View File

@ -40,7 +40,7 @@ $error=0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once($path."../../htdocs/master.inc.php");
require_once $path."../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@ -58,7 +58,7 @@ print "***** ".$script_file." (".$version.") *****\n";
// Start of transaction
$db->begin();
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
require_once DOL_DOCUMENT_ROOT."/user/class/user.class.php";
// Create user object
$obj = new User($db);

4
dev/examples/code/get_contracts.php
View File

@ -40,7 +40,7 @@ $error=0;
// -------------------- START OF YOUR CODE HERE --------------------
// Include Dolibarr environment
require_once($path."../../htdocs/master.inc.php");
require_once $path."../../htdocs/master.inc.php";
// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
//$langs->setDefaultLang('en_US'); // To change default language of $langs
@ -65,7 +65,7 @@ print 'Argument id_thirdparty='.$argv[1]."\n";
// Start of transaction
$db->begin();
require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
// Create contract object
$obj = new Contrat($db);

6
dev/initdata/generate-invoice.php
View File

@ -32,9 +32,9 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
require (__DIR__. '/../../htdocs/master.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
require __DIR__. '/../../htdocs/master.inc.php';
require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
/*

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

@ -33,14 +33,14 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
//$path=preg_replace('/generate-commande.php/i','',$_SERVER["PHP_SELF"]);
require (__DIR__. '/../../htdocs/master.inc.php');
require __DIR__. '/../../htdocs/master.inc.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
/*

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

@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
//$path=preg_replace('/generate-produit.php/i','',$_SERVER["PHP_SELF"]);
require (__DIR__. '/../../htdocs/master.inc.php');
require __DIR__. '/../../htdocs/master.inc.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

12
dev/initdata/generate-proposal.php
View File

@ -33,11 +33,11 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
//$path=preg_replace('/generate-propale.php/i','',$_SERVER["PHP_SELF"]);
require (__DIR__. '/../../htdocs/master.inc.php');
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
require_once(DOL_DOCUMENT_ROOT."/commande/class/commande.class.php");
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
require __DIR__. '/../../htdocs/master.inc.php';
require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
require_once DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php";
require_once DOL_DOCUMENT_ROOT."/commande/class/commande.class.php";
require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
/*
* Parameters
@ -157,7 +157,7 @@ $user->rights->propal->propal_advance->validate=1;
if (! empty($conf->global->PROPALE_ADDON) && is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php"))
{
require_once(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php");
require_once DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php";
}
$i=0;

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

@ -33,7 +33,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
//$path=preg_replace('/generate-societe.php/i','',$_SERVER["PHP_SELF"]);
require (__DIR__. '/../../htdocs/master.inc.php');
require __DIR__. '/../../htdocs/master.inc.php';
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

2
dev/initdata/import-products.php
View File

@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
$path=preg_replace('/import-products.php/i','',$_SERVER["PHP_SELF"]);
require ($path."../../htdocs/master.inc.php");
require $path."../../htdocs/master.inc.php";
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

2
dev/initdata/import-thirdparties.php
View File

@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
$path=preg_replace('/import-thirdparties.php/i','',$_SERVER["PHP_SELF"]);
require ($path."../../htdocs/master.inc.php");
require $path."../../htdocs/master.inc.php";
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

2
dev/initdata/import-users.php
View File

@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
$path=preg_replace('/import-users.php/i','',$_SERVER["PHP_SELF"]);
require ($path."../../htdocs/master.inc.php");
require $path."../../htdocs/master.inc.php";
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

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

@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
// Recupere root dolibarr
$path=preg_replace('/purge-data.php/i','',$_SERVER["PHP_SELF"]);
require ($path."../../htdocs/master.inc.php");
require $path."../../htdocs/master.inc.php";
include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

16
dev/initdemo/sftpget_and_loaddump.php
View File

@ -41,15 +41,15 @@ $passwordbase=isset($argv[6])?$argv[6]:'';
// Include Dolibarr environment
$res=0;
if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php");
if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php");
if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php");
if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php");
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php";
if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php";
if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php";
if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php";
if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php";
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (! $res) die ("Failed to include master.inc.php file\n");
include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
/*

16
dev/initdemo/updatedemo.php
View File

@ -36,15 +36,15 @@ $confirm=isset($argv[1])?$argv[1]:'';
// Include Dolibarr environment
$res=0;
if (! $res && file_exists($path."../../master.inc.php")) $res=@include($path."../../master.inc.php");
if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include($path."../../htdocs/master.inc.php");
if (! $res && file_exists("../master.inc.php")) $res=@include("../master.inc.php");
if (! $res && file_exists("../../master.inc.php")) $res=@include("../../master.inc.php");
if (! $res && file_exists("../../../master.inc.php")) $res=@include("../../../master.inc.php");
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include($path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include("../../../dolibarr".$reg[1]."/htdocs/master.inc.php"); // Used on dev env only
if (! $res && file_exists($path."../../master.inc.php")) $res=@include $path."../../master.inc.php";
if (! $res && file_exists($path."../../htdocs/master.inc.php")) $res=@include $path."../../htdocs/master.inc.php";
if (! $res && file_exists("../master.inc.php")) $res=@include "../master.inc.php";
if (! $res && file_exists("../../master.inc.php")) $res=@include "../../master.inc.php";
if (! $res && file_exists("../../../master.inc.php")) $res=@include "../../../master.inc.php";
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include $path."../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (! $res && preg_match('/\/nltechno([^\/]*)\//',$_SERVER["PHP_SELF"],$reg)) $res=@include "../../../dolibarr".$reg[1]."/htdocs/master.inc.php"; // Used on dev env only
if (! $res) die ("Failed to include master.inc.php file\n");
include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
/*

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

@ -285,7 +285,20 @@
<!-- <rule ref="PEAR.ControlStructures.MultiLineCondition" /> -->
<!-- Test if () are removed for includes -->
<!-- <rule ref="PEAR.Files.IncludingFile"/> -->
<rule ref="PEAR.Files.IncludingFile" />
<!-- Disable some error messages that we do not want. -->
<rule ref="PEAR.Files.IncludingFile.UseInclude">
<severity>0</severity>
</rule>
<rule ref="PEAR.Files.IncludingFile.UseIncludeOnce">
<severity>0</severity>
</rule>
<rule ref="PEAR.Files.IncludingFile.UseRequire">
<severity>0</severity>
</rule>
<rule ref="PEAR.Files.IncludingFile.UseRequireOnce">
<severity>0</severity>
</rule>
<rule ref="PEAR.Formatting.MultiLineAssignment" />

4
dev/tools/test/testtcpdf.php
View File

@ -27,8 +27,8 @@
* @since 2008-03-04
*/
require_once('../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php');
require_once('../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php');
require_once '../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php';
require_once '../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php';
// create new PDF document
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);

4
dev/tools/test/testutf.php
View File

@ -47,8 +47,8 @@ print 'Files has been created. Check its name from your explorer'."\n";
* @since 2008-09-15
*/
require_once('../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php');
require_once('../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php');
require_once '../../htdocs/includes/tecnickcom/tcpdf/config/tcpdf_config.php';
require_once '../../htdocs/includes/tecnickcom/tcpdf/tcpdf.php';
// create new PDF document
$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);

6
dev/translation/autotranslator.php
View File

@ -37,8 +37,8 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
}
// Include Dolibarr environment
require_once($path.'../../htdocs/master.inc.php');
require_once($path.'../../htdocs/core/lib/files.lib.php');
require_once $path.'../../htdocs/master.inc.php';
require_once $path.'../../htdocs/core/lib/files.lib.php';
// After this $db is an opened handler to database. We close it at end of file.
// Load main language strings
@ -88,7 +88,7 @@ if ($argv[2] != 'all')
}
}
require_once(DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php");
require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";
$langParser = new autoTranslator($argv[2],$argv[1],$dir,$file,$argv[3]);

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

@ -406,5 +406,6 @@ if ($resql)
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

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

@ -1004,7 +1004,7 @@ if ($id)
print '<br>';
// End of page
llxFooter();
$db->close();

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

@ -397,6 +397,6 @@ else if ($id > 0 || $ref) {
}
}
// End of page
llxFooter();
$db->close();

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

@ -184,6 +184,6 @@ if ($action == 'display' || $action == 'delete') {
print "</table>";
}
// End of page
llxFooter();
$db->close();

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

@ -800,7 +800,7 @@ if ($id)
print '<br>';
// End of page
llxFooter();
$db->close();

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

@ -190,5 +190,6 @@ print '<div class="center"><input type="submit" class="button" value="' . $langs
print '</form>';
// End of page
llxFooter();
$db->close();

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

@ -278,5 +278,6 @@ print '<div class="center"><input type="submit" class="button" value="' . dol_es
print '</form>';
// End of page
llxFooter();
$db->close();

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

@ -156,6 +156,6 @@ if ($result)
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/admin/fiscalyear_card.php
View File

@ -318,5 +318,6 @@ if ($action == 'create')
}
}
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/admin/fiscalyear_info.php
View File

@ -58,5 +58,6 @@ if ($id) {
print '</div>';
}
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/admin/importaccounts.php
View File

@ -181,5 +181,6 @@ if ($result) {
print $db->error();
}
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/admin/index.php
View File

@ -295,5 +295,6 @@ print '<br>';
print '<br>';
print '</form>';
// End of page
llxFooter();
$db->close();

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

@ -683,7 +683,7 @@ if ($id)
print '<br>';
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/admin/productaccount.php
View File

@ -495,5 +495,6 @@ if ($result)
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

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

@ -298,7 +298,8 @@ else {
print "</table>";
print '</form>';
llxFooter();
}
// End of page
llxFooter();
$db->close();

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

@ -140,5 +140,6 @@ if ($resql) {
}
print "</table>\n";
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/bookkeeping/card.php
View File

@ -714,5 +714,6 @@ if ($action == 'create')
dol_fiche_end();
// End of page
llxFooter();
$db->close();

2
htdocs/accountancy/bookkeeping/list.php
View File

@ -748,6 +748,6 @@ print '</div>';
print '</form>';
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/bookkeeping/listbyaccount.php
View File

@ -421,5 +421,6 @@ print '</tr>';
print "</table>";
print '</form>';
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/customer/card.php
View File

@ -159,5 +159,6 @@ if (! empty($id)) {
print "Error ID incorrect";
}
// End of page
llxFooter();
$db->close();

2
htdocs/accountancy/customer/index.php
View File

@ -415,6 +415,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
}
}
// End of page
llxFooter();
$db->close();

2
htdocs/accountancy/customer/lines.php
View File

@ -400,6 +400,6 @@ if ($result) {
print $db->lasterror();
}
// End of page
llxFooter();
$db->close();

6
htdocs/accountancy/customer/list.php
View File

@ -201,8 +201,9 @@ llxHeader('', $langs->trans("Ventilation"));
if (empty($chartaccountcode))
{
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
llxFooter();
$db->close();
// End of page
llxFooter();
$db->close();
exit;
}
@ -524,5 +525,6 @@ jQuery(document).ready(function() {
});
</script>';
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/expensereport/card.php
View File

@ -167,5 +167,6 @@ if (! empty($id)) {
print "Error ID incorrect";
}
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/expensereport/index.php
View File

@ -345,5 +345,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '</div>';
}
// End of page
llxFooter();
$db->close();

2
htdocs/accountancy/expensereport/lines.php
View File

@ -349,6 +349,6 @@ if ($result) {
print $db->lasterror();
}
// End of page
llxFooter();
$db->close();

6
htdocs/accountancy/expensereport/list.php
View File

@ -180,8 +180,9 @@ llxHeader('', $langs->trans("ExpenseReportsVentilation"));
if (empty($chartaccountcode))
{
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
llxFooter();
$db->close();
// End of page
llxFooter();
$db->close();
exit;
}
@ -422,5 +423,6 @@ jQuery(document).ready(function() {
});
</script>';
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/index.php
View File

@ -163,5 +163,6 @@ else
print $langs->trans("Module10Desc")."<br>\n";
}
// End of page
llxFooter();
$db->close();

1
htdocs/accountancy/supplier/card.php
View File

@ -162,5 +162,6 @@ if (! empty($id)) {
print "Error ID incorrect";
}
// End of page
llxFooter();
$db->close();

2
htdocs/accountancy/supplier/index.php
View File

@ -342,6 +342,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '</div>';
}
// End of page
llxFooter();
$db->close();

3
htdocs/accountancy/supplier/lines.php
View File

@ -406,7 +406,6 @@ if ($result) {
print $db->lasterror();
}
// End of page
llxFooter();
$db->close();

6
htdocs/accountancy/supplier/list.php
View File

@ -202,8 +202,9 @@ llxHeader('', $langs->trans("SuppliersVentilation"));
if (empty($chartaccountcode))
{
print $langs->trans("ErrorChartOfAccountSystemNotSelected");
llxFooter();
$db->close();
// End of page
llxFooter();
$db->close();
exit;
}
@ -532,5 +533,6 @@ jQuery(document).ready(function() {
});
</script>';
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/admin/adherent.php
View File

@ -265,7 +265,6 @@ form_constantes($constantes, 0, $helptext);
dol_fiche_end();
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/admin/adherent_emails.php
View File

@ -160,7 +160,6 @@ form_constantes($constantes, 0, $helptext);
dol_fiche_end();
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/admin/adherent_extrafields.php
View File

@ -113,6 +113,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/admin/adherent_type_extrafields.php
View File

@ -116,6 +116,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/admin/website.php
View File

@ -250,7 +250,6 @@ if (! empty($conf->global->MEMBER_ENABLE_PUBLIC))
print '<a target="_blank" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.$urlwithroot.'/public/members/new.php'.$entity_qr.'</a>';
}
// End of page
llxFooter();
$db->close();

4
htdocs/adherents/agenda.php
View File

@ -175,8 +175,6 @@ if ($object->id > 0)
}
}
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/card.php
View File

@ -1896,6 +1896,6 @@ else
}
}
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/cartes/carte.php
View File

@ -310,6 +310,6 @@ print '<br><input class="button" type="submit" value="'.$langs->trans("BuildDoc"
print '</form>';
print '<br>';
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/document.php
View File

@ -170,6 +170,6 @@ else
print $langs->trans("ErrorRecordNotFound");
}
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/htpasswd.php
View File

@ -86,7 +86,6 @@ else
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/index.php
View File

@ -435,6 +435,6 @@ print "</div>";
print '</div></div></div>';
// End of page
llxFooter();
$db->close();

1
htdocs/adherents/ldap.php
View File

@ -221,5 +221,6 @@ else
print '</table>';
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/list.php
View File

@ -827,6 +827,6 @@ print '</form>';
if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit, 1);
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/note.php
View File

@ -120,6 +120,6 @@ if ($id)
}
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/stats/byproperties.php
View File

@ -143,7 +143,6 @@ print '</table>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

4
htdocs/adherents/stats/geo.php
View File

@ -309,8 +309,6 @@ if ($mode)
dol_fiche_end();
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/stats/index.php
View File

@ -229,7 +229,6 @@ print '<div style="clear:both"></div>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/subscription.php
View File

@ -1108,7 +1108,6 @@ else
print $langs->trans("ErrorRecordNotFound");
}
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/subscription/card.php
View File

@ -417,7 +417,6 @@ if ($rowid && $action != 'edit')
print '</div></div></div>';
}
// End of page
llxFooter();
$db->close();

1
htdocs/adherents/subscription/info.php
View File

@ -76,5 +76,6 @@ print '</div>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

2
htdocs/adherents/subscription/list.php
View File

@ -381,6 +381,6 @@ else
dol_print_error($db);
}
// End of page
llxFooter();
$db->close();

3
htdocs/adherents/type.php
View File

@ -787,7 +787,6 @@ if ($rowid > 0)
}
}
// End of page
llxFooter();
$db->close();

1
htdocs/adherents/type_ldap.php
View File

@ -187,5 +187,6 @@ else
print '</table>';
// End of page
llxFooter();
$db->close();

2
htdocs/admin/agenda.php
View File

@ -202,6 +202,6 @@ print "</form>\n";
print "<br>";
// End of page
llxFooter();
$db->close();

2
htdocs/admin/agenda_extrafields.php
View File

@ -117,6 +117,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

3
htdocs/admin/agenda_extsites.php
View File

@ -238,7 +238,6 @@ print '</div>';
print "</form>\n";
// End of page
llxFooter();
$db->close();

2
htdocs/admin/agenda_other.php
View File

@ -399,6 +399,6 @@ print '</form>';
print "<br>";
// End of page
llxFooter();
$db->close();

2
htdocs/admin/agenda_reminder.php
View File

@ -247,6 +247,6 @@ print '</form>';
print "<br>";
// End of page
llxFooter();
$db->close();

2
htdocs/admin/agenda_xcal.php
View File

@ -198,6 +198,6 @@ if (! empty($conf->use_javascript_ajax))
print '</script>';
}
// End of page
llxFooter();
$db->close();

2
htdocs/admin/bank.php
View File

@ -432,6 +432,6 @@ print "</tr>\n";
print '</table>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

2
htdocs/admin/bank_extrafields.php
View File

@ -114,6 +114,6 @@ if ($action == 'edit' && ! empty($attrname))
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
}
// End of page
llxFooter();
$db->close();

1
htdocs/admin/barcode.php
View File

@ -405,5 +405,6 @@ if ($conf->produit->enabled)
print "<br>";
// End of page
llxFooter();
$db->close();

3
htdocs/admin/boxes.php
View File

@ -488,7 +488,6 @@ print '<div class="center"><input type="submit" class="button" value="'.$langs->
print '</form>';
print "\n".'<!-- End Other Const -->'."\n";
// End of page
llxFooter();
$db->close();

2
htdocs/admin/chequereceipts.php
View File

@ -280,6 +280,6 @@ dol_fiche_end();
print '</form>';
// End of page
llxFooter();
$db->close();

2
htdocs/admin/clicktodial.php
View File

@ -140,6 +140,6 @@ if (! empty($conf->global->CLICKTODIAL_URL))
}
}
// End of page
llxFooter();
$db->close();

3
htdocs/admin/commande.php
View File

@ -679,7 +679,6 @@ print "</td></tr>\n";
print '</table>';
// End of page
llxFooter();
$db->close();

3
htdocs/admin/company.php
View File

@ -1153,7 +1153,6 @@ else
print '</div>';
}
// End of page
llxFooter();
$db->close();

1
htdocs/admin/compta.php
View File

@ -164,5 +164,6 @@ print "</table>\n";
print '<br><br><div style="text-align:center"><input type="submit" class="button" value="'.$langs->trans('Modify').'" name="button"></div>';
print '</form>';
// End of page
llxFooter();
$db->close();

1
htdocs/admin/confexped.php
View File

@ -147,5 +147,6 @@ print '</table>';
print '</div>';
// End of page
llxFooter();
$db->close();

3
htdocs/admin/const.php
View File

@ -314,7 +314,6 @@ if ($conf->use_javascript_ajax)
print "</form>\n";
// End of page
llxFooter();
$db->close();

3
htdocs/admin/contract.php
View File

@ -509,7 +509,6 @@ print '</form>';
dol_fiche_end();
// End of page
llxFooter();
$db->close();

2
htdocs/admin/dav.php
View File

@ -143,6 +143,6 @@ $message.=img_picto('','object_globe.png').' '.$langs->trans("WebDavServer",'Web
$message.='<br>';
print $message;
// End of page
llxFooter();
$db->close();

3
htdocs/admin/defaultvalues.php
View File

@ -412,7 +412,6 @@ dol_fiche_end();
print "</form>\n";
// End of page
llxFooter();
$db->close();

1
htdocs/admin/delais.php
View File

@ -415,5 +415,6 @@ if($action == 'edit') {
}
// End of page
llxFooter();
$db->close();

2
htdocs/admin/dict.php
View File

@ -1735,7 +1735,7 @@ else
print '<br>';
// End of page
llxFooter();
$db->close();

25
htdocs/admin/dolistore/ajax/image.php
View File

@ -20,22 +20,11 @@ if (!defined('REQUIRE_JQUERY_BLOCKUI')) define('REQUIRE_JQUERY_BLOCKUI', 1);
/**
* \file htdocs/commande/info.php
* \ingroup commande
* \brief Page des informations d'une commande
* \file htdocs/admin/dolistore/ajax.php
* \ingroup admin
* \brief Page des informations dolistore
*/
$res = 0;
if (!$res && file_exists("../main.inc.php")) $res = @include("../main.inc.php");
if (!$res && file_exists("../../main.inc.php")) $res = @include("../../main.inc.php");
if (!$res && file_exists("../../../main.inc.php")) $res = @include("../../../main.inc.php");
if (!$res && file_exists("../../../../main.inc.php")) $res = @include("../../../../main.inc.php");
if (!$res && file_exists("../../../dolibarr/htdocs/main.inc.php"))
$res = @include("../../../dolibarr/htdocs/main.inc.php"); // Used on dev env only
if (!$res && file_exists("../../../../dolibarr/htdocs/main.inc.php"))
$res = @include("../../../../dolibarr/htdocs/main.inc.php"); // Used on dev env only
if (!$res && file_exists("../../../../../dolibarr/htdocs/main.inc.php"))
$res = @include("../../../../../dolibarr/htdocs/main.inc.php"); // Used on dev env only
if (!$res) die("Include of main fails");
require "../../../main.inc.php";
// CORE
@ -52,8 +41,10 @@ $quality = GETPOST('quality', 'alpha');
try {
$url = $conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'/api/images/products/'.$id_product.'/'.$id_image.'/'.$quality;
$api = new PrestaShopWebservice($conf->global->MAIN_MODULE_DOLISTORE_API_SRV,
$conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $dolistore->debug_api);
$api = new PrestaShopWebservice(
$conf->global->MAIN_MODULE_DOLISTORE_API_SRV,
$conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $dolistore->debug_api
);
//echo $url;
$request = $api->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
header('Content-type:image');

4
htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
View File

@ -53,7 +53,7 @@ class PrestaShopWebservice
* PrestaShopWebservice constructor. Throw an exception when CURL is not installed/activated
* <code>
* <?php
* require_once('./PrestaShopWebservice.php');
* require_once './PrestaShopWebservice.php';
* try
* {
* $ws = new PrestaShopWebservice('http://mystore.com/', 'ZQ88PRJX5VWQHCWE4EE7SQ7HPNX00RAJ', false);
@ -279,7 +279,7 @@ class PrestaShopWebservice
* </p>
* <code>
* <?php
* require_once('./PrestaShopWebservice.php');
* require_once './PrestaShopWebservice.php';
* try
* {
* $ws = new PrestaShopWebservice('http://mystore.com/', 'ZQ88PRJX5VWQHCWE4EE7SQ7HPNX00RAJ', false);

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