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

Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-14 01:54:23 +02:00
commit 91900f54c2
8 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -18,6 +18,7 @@ Fix: Update impayees.php
Fix: Link product, In list view and label product Fix: Link product, In list view and label product
Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to. Fix: visible task into area "time" for "My task" must limit task to tasks i am assigned to.
Fix: When disabled, all fields to add time into task line must be disabled. Fix: When disabled, all fields to add time into task line must be disabled.
Fix: Missing include files.lib.php in some pages ti use dol_delete_recursive
***** ChangeLog for 3.5.4 compared to 3.5.3 ***** ***** ChangeLog for 3.5.4 compared to 3.5.3 *****
Fix: Hide title of event when agenda module disabled. Fix: Hide title of event when agenda module disabled.

1
htdocs/adherents/fiche.php
View File

@ -328,6 +328,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
{ {
if (GETPOST('deletephoto')) if (GETPOST('deletephoto'))
{ {
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$fileimg=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/'.$object->photo; $fileimg=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/'.$object->photo;
$dirthumbs=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/thumbs'; $dirthumbs=$conf->adherent->dir_output.'/'.get_exdir($object->id,2,0,1).'/photos/thumbs';
dol_delete_file($fileimg); dol_delete_file($fileimg);

2
htdocs/admin/tools/update.php
View File

@ -23,7 +23,7 @@
*/ */
require '../../main.inc.php'; require '../../main.inc.php';
include_once $dolibarr_main_document_root.'/core/lib/files.lib.php'; include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$langs->load("admin"); $langs->load("admin");
$langs->load("other"); $langs->load("other");

1
htdocs/contrat/class/contrat.class.php
View File

@ -811,6 +811,7 @@ class Contrat extends CommonObject
function delete($user) function delete($user)
{ {
global $conf, $langs; global $conf, $langs;
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$error=0; $error=0;

4
htdocs/core/lib/pdf.lib.php
View File

@ -427,7 +427,7 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
global $conf; global $conf;
// Add a background image on document // Add a background image on document
if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) if (! empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) // Warning, this option make TCPDF generation beeing crazy and some content disappeared behin the image
{ {
$pdf->SetAutoPageBreak(0,0); // Disable auto pagebreak before adding image $pdf->SetAutoPageBreak(0,0); // Disable auto pagebreak before adding image
$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height); $pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_X:0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y)?$conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y:0), 0, $page_height);
@ -795,7 +795,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
if ($line) // Free text if ($line) // Free text
{ {
$pdf->SetXY($dims['lm'],-$posy); $pdf->SetXY($dims['lm'],-$posy);
$pdf->MultiCell($width, 3, $line, 0, $align, 0); $pdf->MultiCell(0, 3, $line, 0, $align, 0);
$posy-=$freetextheight; $posy-=$freetextheight;
} }

1
htdocs/product/class/product.class.php
View File

@ -594,6 +594,7 @@ class Product extends CommonObject
function delete($id=0) function delete($id=0)
{ {
global $conf,$user,$langs; global $conf,$user,$langs;
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$error=0; $error=0;

1
htdocs/projet/class/task.class.php
View File

@ -354,6 +354,7 @@ class Task extends CommonObject
{ {
global $conf, $langs; global $conf, $langs;
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$error=0; $error=0;

2
htdocs/theme/eldy/style.css.php
View File

@ -681,7 +681,7 @@ div.mainmenu.click2dial {
} }
div.mainmenu.companies { div.mainmenu.companies {
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png',1) ?>); background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png',1) ?>);
} }
div.mainmenu.commercial { div.mainmenu.commercial {