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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-05-09 12:38:27 +02:00
commit 52153d6aa2
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -68,6 +68,7 @@ FIX: Total per day in timespent per week
FIX: Total per day shows 00:00 if the total time spent is equal to 12:00 FIX: Total per day shows 00:00 if the total time spent is equal to 12:00
FIX: Update/delete currency on same languages FIX: Update/delete currency on same languages
FIX: Wrong variable name make contact of supplier order not used on PDF. FIX: Wrong variable name make contact of supplier order not used on PDF.
FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick hack to fix output pb).
***** ChangeLog for 9.0.2 compared to 9.0.1 ***** ***** ChangeLog for 9.0.2 compared to 9.0.1 *****
FIX: #10822 FIX: #10822

4
htdocs/admin/emailcollector_card.php
View File

@ -33,8 +33,8 @@ include_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollectorfilter.class
include_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollectoraction.class.php'; include_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollectoraction.class.php';
include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php'; include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
if (!$user->admin) if (!$user->admin) accessforbidden();
accessforbidden(); if (empty($conf->emailcollector->enabled)) accessforbidden();
// Load traductions files requiredby by page // Load traductions files requiredby by page
$langs->loadLangs(array("admin", "mails", "other")); $langs->loadLangs(array("admin", "mails", "other"));

1
htdocs/admin/emailcollector_list.php
View File

@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
dol_include_once('/emailcollector/class/emailcollector.class.php'); dol_include_once('/emailcollector/class/emailcollector.class.php');
if (!$user->admin) accessforbidden(); if (!$user->admin) accessforbidden();
if (empty($conf->emailcollector->enabled)) accessforbidden();
// Load traductions files requiredby by page // Load traductions files requiredby by page
$langs->loadLangs(array("admin", "other")); $langs->loadLangs(array("admin", "other"));

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -379,7 +379,7 @@ class pdf_crabe extends ModelePDFFactures
$progress_width = 0; $progress_width = 0;
// Situation invoice handling // Situation invoice handling
if ($object->situation_cycle_ref) if ($object->situation_cycle_ref && empty($conf->global->MAIN_PDF_HIDE_SITUATION))
{ {
$this->situationinvoice = true; $this->situationinvoice = true;
$progress_width = 10; $progress_width = 10;