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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-20 18:06:15 +02:00
commit dcd84e0310
3 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/product/index.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Charles-Fr BENKE <charles.fr@benke.fr> * Copyright (C) 2014-2016 Charlie BENKE <charlie@patas-monkey.com>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr> * Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -347,7 +347,7 @@ else
// TODO Move this into a page that should be available into menu "accountancy - report - turnover - per quarter" // TODO Move this into a page that should be available into menu "accountancy - report - turnover - per quarter"
// Also method used for counting must provide the 2 possible methods like done by all other reports into menu "accountancy - report - turnover": // Also method used for counting must provide the 2 possible methods like done by all other reports into menu "accountancy - report - turnover":
// "commitment engagment" method and "cash accounting" method // "commitment engagment" method and "cash accounting" method
if ($conf->global->MAIN_FEATURES_LEVEL) if (! empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM))
{ {
if (! empty($conf->product->enabled)) activitytrim(0); if (! empty($conf->product->enabled)) activitytrim(0);
if (! empty($conf->service->enabled)) activitytrim(1); if (! empty($conf->service->enabled)) activitytrim(1);

5
htdocs/product/stats/card.php
View File

@ -244,7 +244,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
$px = new DolGraph(); $px = new DolGraph();
if (! $error) if (! $error && count($graphfiles)>0)
{ {
$mesg = $px->isGraphKo(); $mesg = $px->isGraphKo();
if (! $mesg) if (! $mesg)
@ -301,6 +301,8 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
// Show graphs // Show graphs
$i=0; $i=0;
if ( count($graphfiles)>0)
{
foreach($graphfiles as $key => $val) foreach($graphfiles as $key => $val)
{ {
if (! $graphfiles[$key]['file']) continue; if (! $graphfiles[$key]['file']) continue;
@ -360,6 +362,7 @@ if (! empty($id) || ! empty($ref) || GETPOST('id') == 'all')
$i++; $i++;
} }
}
// div not closed // div not closed
if ($i % 2 == 1) if ($i % 2 == 1)
{ {

2
htdocs/societe/index.php
View File

@ -326,7 +326,7 @@ if ($result)
$i++; $i++;
} }
$db->free(); $db->free($result);
print "</table>\n"; print "</table>\n";
print "<!-- End last thirdparties modified -->\n"; print "<!-- End last thirdparties modified -->\n";