Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
This commit is contained in:
Maxime Kohlhaas
commit
efff92fe1c
@ -109,3 +109,6 @@ git-buildpackage --git-tag
|
||||
git push
|
||||
git push --tags
|
||||
|
||||
* Then ???
|
||||
http://packages.qa.debian.org/t/tcpdf.html
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ class modMyModule extends DolibarrModules
|
||||
// 'login' => 0, // Set this to 1 if module has its own login method directory (core/login)
|
||||
// 'substitutions' => 0, // Set this to 1 if module has its own substitution function file (core/substitutions)
|
||||
// 'menus' => 0, // Set this to 1 if module has its own menus handler directory (core/menus)
|
||||
// 'theme' => 0, // Set this to 1 if module has its own theme directory (core/theme)
|
||||
// 'theme' => 0, // Set this to 1 if module has its own theme directory (theme)
|
||||
// 'tpl' => 0, // Set this to 1 if module overwrite template dir (core/tpl)
|
||||
// 'barcode' => 0, // Set this to 1 if module has its own barcode directory (core/modules/barcode)
|
||||
// 'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx)
|
||||
|
||||
@ -70,7 +70,7 @@ if ($mode == 'customer')
|
||||
}
|
||||
if ($mode == 'supplier')
|
||||
{
|
||||
$title=$langs->trans("OrdersStatisticsSuppliers");
|
||||
$title=$langs->trans("OrdersStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
|
||||
$dir=$conf->fournisseur->dir_output.'/commande/temp';
|
||||
}
|
||||
|
||||
|
||||
@ -91,9 +91,6 @@ $fieldid = (! empty($ref)?'facnumber':'rowid');
|
||||
if (! empty($user->societe_id)) $socid=$user->societe_id;
|
||||
$result = restrictedArea($user, 'facture', $id,'','','fk_soc',$fieldid);
|
||||
|
||||
// FIXME $usehm not used ?
|
||||
$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:false);
|
||||
|
||||
$object=new Facture($db);
|
||||
|
||||
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
|
||||
|
||||
@ -29,7 +29,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
|
||||
class box_graph_orders_permonth extends ModeleBoxes
|
||||
{
|
||||
var $boxcode="orderspermonth";
|
||||
var $boximg="object_bill";
|
||||
var $boximg="object_order";
|
||||
var $boxlabel="BoxCustomersOrdersPerMonth";
|
||||
var $depends = array("commande");
|
||||
|
||||
|
||||
225
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
Normal file
225
htdocs/core/boxes/box_graph_orders_supplier_permonth.php
Normal file
@ -0,0 +1,225 @@
|
||||
<?php
|
||||
/* Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/core/boxes/box_graph_orders_supplier_permonth.php
|
||||
* \ingroup fournisseur
|
||||
* \brief Box to show graph of orders per month
|
||||
*/
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage the box to show last orders
|
||||
*/
|
||||
class box_graph_orders_supplier_permonth extends ModeleBoxes
|
||||
{
|
||||
var $boxcode="orderssupplierpermonth";
|
||||
var $boximg="object_order";
|
||||
var $boxlabel="BoxSuppliersOrdersPerMonth";
|
||||
var $depends = array("fournisseur");
|
||||
|
||||
var $db;
|
||||
|
||||
var $info_box_head = array();
|
||||
var $info_box_contents = array();
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param string $param More parameters
|
||||
*/
|
||||
function __construct($db,$param)
|
||||
{
|
||||
global $conf;
|
||||
|
||||
$this->db=$db;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load data into info_box_contents array to show array later.
|
||||
*
|
||||
* @param int $max Maximum number of records to load
|
||||
* @return void
|
||||
*/
|
||||
function loadBox($max=5)
|
||||
{
|
||||
global $conf, $user, $langs, $db;
|
||||
|
||||
$this->max=$max;
|
||||
|
||||
$refreshaction='refresh_'.$this->boxcode;
|
||||
|
||||
include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
|
||||
$facturestatic=new Facture($db);
|
||||
|
||||
$text = $langs->trans("BoxSuppliersOrdersPerMonth",$max);
|
||||
$this->info_box_head = array(
|
||||
'text' => $text,
|
||||
'limit'=> dol_strlen($text),
|
||||
'graph'=> 1,
|
||||
'sublink'=>$_SERVER["PHP_SELF"].'?action='.$refreshaction,
|
||||
'subtext'=>$langs->trans("Refresh"),
|
||||
'subpicto'=>'refresh.png',
|
||||
'target'=>'none'
|
||||
);
|
||||
|
||||
if ($user->rights->fournisseur->commande->lire)
|
||||
{
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
|
||||
include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
|
||||
|
||||
$shownb=(! empty($conf->global->COMMANDE_BOX_GRAPH_SHOW_NB));
|
||||
$showtot=(! isset($conf->global->COMMANDE_BOX_GRAPH_SHOW_TOT) || ! empty($conf->global->COMMANDE_BOX_GRAPH_SHOW_TOT));
|
||||
$nowarray=dol_getdate(dol_now(),true);
|
||||
$endyear=$nowarray['year'];
|
||||
$startyear=$endyear-1;
|
||||
$mode='supplier';
|
||||
$userid=0;
|
||||
$WIDTH='256';
|
||||
$HEIGHT='192';
|
||||
|
||||
$stats = new CommandeStats($this->db, 0, $mode, ($userid>0?$userid:0));
|
||||
|
||||
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
|
||||
if ($shownb)
|
||||
{
|
||||
$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
|
||||
|
||||
$filenamenb = $dir."/orderssuppliernbinyear-".$year.".png";
|
||||
if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
|
||||
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssuppliernbinyear-'.$year.'.png';
|
||||
|
||||
$px1 = new DolGraph();
|
||||
$mesg = $px1->isGraphKo();
|
||||
if (! $mesg)
|
||||
{
|
||||
$px1->SetData($data1);
|
||||
unset($data1);
|
||||
$px1->SetPrecisionY(0);
|
||||
$i=$startyear;$legend=array();
|
||||
while ($i <= $endyear)
|
||||
{
|
||||
$legend[]=$i;
|
||||
$i++;
|
||||
}
|
||||
$px1->SetLegend($legend);
|
||||
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
||||
$px1->SetWidth($WIDTH);
|
||||
$px1->SetHeight($HEIGHT);
|
||||
$px1->SetYLabel($langs->trans("NumberOfOrders"));
|
||||
$px1->SetShading(3);
|
||||
$px1->SetHorizTickIncrement(1);
|
||||
$px1->SetPrecisionY(0);
|
||||
$px1->SetCssPrefix("cssboxes");
|
||||
$px1->mode='depth';
|
||||
$px1->SetTitle($langs->trans("NumberOfOrdersByMonth"));
|
||||
|
||||
$px1->draw($filenamenb,$fileurlnb);
|
||||
}
|
||||
}
|
||||
|
||||
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
|
||||
if ($showtot)
|
||||
{
|
||||
$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
|
||||
|
||||
$filenamenb = $dir."/orderssupplieramountinyear-".$year.".png";
|
||||
if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
|
||||
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=orderssupplieramountinyear-'.$year.'.png';
|
||||
|
||||
$px2 = new DolGraph();
|
||||
$mesg = $px2->isGraphKo();
|
||||
if (! $mesg)
|
||||
{
|
||||
$px2->SetData($data2);
|
||||
unset($data2);
|
||||
$px2->SetPrecisionY(0);
|
||||
$i=$startyear;$legend=array();
|
||||
while ($i <= $endyear)
|
||||
{
|
||||
$legend[]=$i;
|
||||
$i++;
|
||||
}
|
||||
$px2->SetLegend($legend);
|
||||
$px2->SetMaxValue($px2->GetCeilMaxValue());
|
||||
$px2->SetWidth($WIDTH);
|
||||
$px2->SetHeight($HEIGHT);
|
||||
$px2->SetYLabel($langs->trans("AmountOfOrdersHT"));
|
||||
$px2->SetShading(3);
|
||||
$px2->SetHorizTickIncrement(1);
|
||||
$px2->SetPrecisionY(0);
|
||||
$px2->SetCssPrefix("cssboxes");
|
||||
$px2->mode='depth';
|
||||
$px2->SetTitle($langs->trans("AmountOfOrdersByMonthHT"));
|
||||
|
||||
$px2->draw($filenamenb,$fileurlnb);
|
||||
}
|
||||
}
|
||||
|
||||
if (! $mesg)
|
||||
{
|
||||
if ($shownb && $showtot)
|
||||
{
|
||||
$stringtoshow ='<div class="fichecenter">';
|
||||
$stringtoshow.='<div class="fichehalfleft">';
|
||||
}
|
||||
if ($shownb) $stringtoshow.=$px1->show();
|
||||
if ($shownb && $showtot)
|
||||
{
|
||||
$stringtoshow.='</div>';
|
||||
$stringtoshow.='<div class="fichehalfright">';
|
||||
}
|
||||
if ($showtot) $stringtoshow.=$px2->show();
|
||||
if ($shownb && $showtot)
|
||||
{
|
||||
$stringtoshow.='</div>';
|
||||
$stringtoshow.='</div>';
|
||||
}
|
||||
$this->info_box_contents[0][0] = array('td' => 'align="center"','textnoformat'=>$stringtoshow);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
|
||||
'maxlength'=>500,
|
||||
'text' => $mesg);
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
$this->info_box_contents[0][0] = array('td' => 'align="left"',
|
||||
'text' => $langs->trans("ReadPermissionNotAllowed"));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to show box
|
||||
*
|
||||
* @param array $head Array with properties of box title
|
||||
* @param array $contents Array with properties of box lines
|
||||
* @return void
|
||||
*/
|
||||
function showBox($head = null, $contents = null)
|
||||
{
|
||||
parent::showBox($this->info_box_head, $this->info_box_contents);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
225
htdocs/core/boxes/box_graph_propales_permonth.php
Normal file
225
htdocs/core/boxes/box_graph_propales_permonth.php
Normal file
@ -0,0 +1,225 @@
|
||||
<?php
|
||||
/* Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/core/boxes/box_graph_propales_permonth.php
|
||||
* \ingroup propales
|
||||
* \brief Box to show graph of proposals per month
|
||||
*/
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
|
||||
|
||||
|
||||
/**
|
||||
* Class to manage the box to show last propals
|
||||
*/
|
||||
class box_graph_propales_permonth extends ModeleBoxes
|
||||
{
|
||||
var $boxcode="propalpermonth";
|
||||
var $boximg="object_propal";
|
||||
var $boxlabel="BoxProposalsPerMonth";
|
||||
var $depends = array("propal");
|
||||
|
||||
var $db;
|
||||
|
||||
var $info_box_head = array();
|
||||
var $info_box_contents = array();
|
||||
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param DoliDB $db Database handler
|
||||
* @param string $param More parameters
|
||||
*/
|
||||
function __construct($db,$param)
|
||||
{
|
||||
global $conf;
|
||||
|
||||
$this->db=$db;
|
||||
}
|
||||
|
||||
/**
|
||||
* Load data into info_box_contents array to show array later.
|
||||
*
|
||||
* @param int $max Maximum number of records to load
|
||||
* @return void
|
||||
*/
|
||||
function loadBox($max=5)
|
||||
{
|
||||
global $conf, $user, $langs, $db;
|
||||
|
||||
$this->max=$max;
|
||||
|
||||
$refreshaction='refresh_'.$this->boxcode;
|
||||
|
||||
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
|
||||
$commandestatic=new Propal($db);
|
||||
|
||||
$text = $langs->trans("BoxProposalsPerMonth",$max);
|
||||
$this->info_box_head = array(
|
||||
'text' => $text,
|
||||
'limit'=> dol_strlen($text),
|
||||
'graph'=> 1,
|
||||
'sublink'=>$_SERVER["PHP_SELF"].'?action='.$refreshaction,
|
||||
'subtext'=>$langs->trans("Refresh"),
|
||||
'subpicto'=>'refresh.png',
|
||||
'target'=>'none'
|
||||
);
|
||||
|
||||
if ($user->rights->commande->lire)
|
||||
{
|
||||
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
|
||||
include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
|
||||
|
||||
$shownb=(! empty($conf->global->PROPAL_BOX_GRAPH_SHOW_NB));
|
||||
$showtot=(! isset($conf->global->PROPAL_BOX_GRAPH_SHOW_TOT) || ! empty($conf->global->PROPAL_BOX_GRAPH_SHOW_TOT));
|
||||
$nowarray=dol_getdate(dol_now(),true);
|
||||
$endyear=$nowarray['year'];
|
||||
$startyear=$endyear-1;
|
||||
$mode='customer';
|
||||
$userid=0;
|
||||
$WIDTH='256';
|
||||
$HEIGHT='192';
|
||||
|
||||
$stats = new PropaleStats($this->db, 0, $mode, ($userid>0?$userid:0));
|
||||
|
||||
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
|
||||
if ($shownb)
|
||||
{
|
||||
$data1 = $stats->getNbByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
|
||||
|
||||
$filenamenb = $dir."/propalsnbinyear-".$year.".png";
|
||||
if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propalsnbinyear-'.$year.'.png';
|
||||
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&file=propalsnbinyear-'.$year.'.png';
|
||||
|
||||
$px1 = new DolGraph();
|
||||
$mesg = $px1->isGraphKo();
|
||||
if (! $mesg)
|
||||
{
|
||||
$px1->SetData($data1);
|
||||
unset($data1);
|
||||
$px1->SetPrecisionY(0);
|
||||
$i=$startyear;$legend=array();
|
||||
while ($i <= $endyear)
|
||||
{
|
||||
$legend[]=$i;
|
||||
$i++;
|
||||
}
|
||||
$px1->SetLegend($legend);
|
||||
$px1->SetMaxValue($px1->GetCeilMaxValue());
|
||||
$px1->SetWidth($WIDTH);
|
||||
$px1->SetHeight($HEIGHT);
|
||||
$px1->SetYLabel($langs->trans("NumberOfProposals"));
|
||||
$px1->SetShading(3);
|
||||
$px1->SetHorizTickIncrement(1);
|
||||
$px1->SetPrecisionY(0);
|
||||
$px1->SetCssPrefix("cssboxes");
|
||||
$px1->mode='depth';
|
||||
$px1->SetTitle($langs->trans("NumberOfProposalsByMonth"));
|
||||
|
||||
$px1->draw($filenamenb,$fileurlnb);
|
||||
}
|
||||
}
|
||||
|
||||
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
|
||||
if ($showtot)
|
||||
{
|
||||
$data2 = $stats->getAmountByMonthWithPrevYear($endyear,$startyear,(GETPOST('action')==$refreshaction?-1:(3600*24)));
|
||||
|
||||
$filenamenb = $dir."/propalsamountinyear-".$year.".png";
|
||||
if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=propalsamountinyear-'.$year.'.png';
|
||||
if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&file=propalsamountinyear-'.$year.'.png';
|
||||
|
||||
$px2 = new DolGraph();
|
||||
$mesg = $px2->isGraphKo();
|
||||
if (! $mesg)
|
||||
{
|
||||
$px2->SetData($data2);
|
||||
unset($data2);
|
||||
$px2->SetPrecisionY(0);
|
||||
$i=$startyear;$legend=array();
|
||||
while ($i <= $endyear)
|
||||
{
|
||||
$legend[]=$i;
|
||||
$i++;
|
||||
}
|
||||
$px2->SetLegend($legend);
|
||||
$px2->SetMaxValue($px2->GetCeilMaxValue());
|
||||
$px2->SetWidth($WIDTH);
|
||||
$px2->SetHeight($HEIGHT);
|
||||
$px2->SetYLabel($langs->trans("AmountOfProposalsHT"));
|
||||
$px2->SetShading(3);
|
||||
$px2->SetHorizTickIncrement(1);
|
||||
$px2->SetPrecisionY(0);
|
||||
$px2->SetCssPrefix("cssboxes");
|
||||
$px2->mode='depth';
|
||||
$px2->SetTitle($langs->trans("AmountOfProposalsByMonthHT"));
|
||||
|
||||
$px2->draw($filenamenb,$fileurlnb);
|
||||
}
|
||||
}
|
||||
|
||||
if (! $mesg)
|
||||
{
|
||||
if ($shownb && $showtot)
|
||||
{
|
||||
$stringtoshow ='<div class="fichecenter">';
|
||||
$stringtoshow.='<div class="fichehalfleft">';
|
||||
}
|
||||
if ($shownb) $stringtoshow.=$px1->show();
|
||||
if ($shownb && $showtot)
|
||||
{
|
||||
$stringtoshow.='</div>';
|
||||
$stringtoshow.='<div class="fichehalfright">';
|
||||
}
|
||||
if ($showtot) $stringtoshow.=$px2->show();
|
||||
if ($shownb && $showtot)
|
||||
{
|
||||
$stringtoshow.='</div>';
|
||||
$stringtoshow.='</div>';
|
||||
}
|
||||
$this->info_box_contents[0][0] = array('td' => 'align="center"','textnoformat'=>$stringtoshow);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->info_box_contents[0][0] = array( 'td' => 'align="left"',
|
||||
'maxlength'=>500,
|
||||
'text' => $mesg);
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
$this->info_box_contents[0][0] = array('td' => 'align="left"',
|
||||
'text' => $langs->trans("ReadPermissionNotAllowed"));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to show box
|
||||
*
|
||||
* @param array $head Array with properties of box title
|
||||
* @param array $contents Array with properties of box lines
|
||||
* @return void
|
||||
*/
|
||||
function showBox($head = null, $contents = null)
|
||||
{
|
||||
parent::showBox($this->info_box_head, $this->info_box_contents);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
@ -641,11 +641,11 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
|
||||
if ((is_numeric($active) && $i == $active)
|
||||
|| (! is_numeric($active) && $active == $links[$i][2]))
|
||||
{
|
||||
$out.='<a data-role="button" id="active" class="tab" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
|
||||
$out.='<a data-role="button" id="active" class="tab inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$out.='<a data-role="button"'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tab" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
|
||||
$out.='<a data-role="button"'.(! empty($links[$i][2])?' id="'.$links[$i][2].'"':'').' class="tab inline-block" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
|
||||
}
|
||||
}
|
||||
$out.='</div>';
|
||||
|
||||
@ -78,13 +78,13 @@ function user_prepare_head($object)
|
||||
$head[$h][2] = 'clicktodial';
|
||||
$h++;
|
||||
}
|
||||
|
||||
|
||||
// Show more tabs from modules
|
||||
// Entries must be declared in modules descriptor with line
|
||||
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
|
||||
// $this->tabs = array('entity:-tabname); to remove a tab
|
||||
complete_head_from_modules($conf,$langs,$object,$head,$h,'user');
|
||||
|
||||
|
||||
//Info on users is visible only by internal user
|
||||
if (empty($user->societe_id))
|
||||
{
|
||||
@ -164,17 +164,17 @@ function user_admin_prepare_head()
|
||||
|
||||
$langs->load("users");
|
||||
$h=0;
|
||||
|
||||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/admin/user.php';
|
||||
$head[$h][1] = $langs->trans("Parameters");
|
||||
$head[$h][2] = 'card';
|
||||
$h++;
|
||||
|
||||
|
||||
$head[$h][0] = DOL_URL_ROOT.'/user/admin/user_extrafields.php';
|
||||
$head[$h][1] = $langs->trans("ExtraFields");
|
||||
$head[$h][2] = 'attributes';
|
||||
$h++;
|
||||
|
||||
|
||||
// Show more tabs from modules
|
||||
// Entries must be declared in modules descriptor with line
|
||||
// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
|
||||
@ -234,7 +234,8 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
|
||||
}
|
||||
}
|
||||
$dirthemes=array_unique($dirthemes);
|
||||
|
||||
// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
|
||||
|
||||
$selected_theme='';
|
||||
if (empty($foruserprofile)) $selected_theme=$conf->global->MAIN_THEME;
|
||||
else $selected_theme=empty($fuser->conf->MAIN_THEME)?'':$fuser->conf->MAIN_THEME;
|
||||
@ -290,10 +291,10 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
|
||||
print '<table class="nobordernopadding" width="100%">';
|
||||
|
||||
$i=0;
|
||||
|
||||
foreach($dirthemes as $dir)
|
||||
{
|
||||
$dirtheme=dol_buildpath($dir,0);
|
||||
//print $dirroot.$dir;exit;
|
||||
$dirtheme=dol_buildpath($dir,0); // This include loop on $conf->file->dol_document_root
|
||||
$urltheme=dol_buildpath($dir,1);
|
||||
|
||||
if (is_dir($dirtheme))
|
||||
|
||||
@ -110,10 +110,11 @@ class modFournisseur extends DolibarrModules
|
||||
// Boxes
|
||||
$this->boxes = array(
|
||||
0=>array('file'=>'box_graph_invoices_supplier_permonth.php','enabledbydefaulton'=>'Home'),
|
||||
1=>array('file'=>'box_fournisseurs.php','enabledbydefaulton'=>'Home'),
|
||||
2=>array('file'=>'box_factures_fourn_imp.php','enabledbydefaulton'=>'Home'),
|
||||
3=>array('file'=>'box_factures_fourn.php','enabledbydefaulton'=>'Home'),
|
||||
4=>array('file'=>'box_supplier_orders.php','enabledbydefaulton'=>'Home'),
|
||||
1=>array('file'=>'box_graph_orders_supplier_permonth.php','enabledbydefaulton'=>'Home'),
|
||||
2=>array('file'=>'box_fournisseurs.php','enabledbydefaulton'=>'Home'),
|
||||
3=>array('file'=>'box_factures_fourn_imp.php','enabledbydefaulton'=>'Home'),
|
||||
4=>array('file'=>'box_factures_fourn.php','enabledbydefaulton'=>'Home'),
|
||||
5=>array('file'=>'box_supplier_orders.php','enabledbydefaulton'=>'Home'),
|
||||
);
|
||||
|
||||
// Permissions
|
||||
|
||||
@ -101,8 +101,10 @@ class modPropale extends DolibarrModules
|
||||
$this->const[$r][4] = 0;
|
||||
|
||||
// Boxes
|
||||
$this->boxes = array();
|
||||
$this->boxes[0][1] = "box_propales.php";
|
||||
$this->boxes = array(
|
||||
0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
|
||||
1=>array('file'=>'box_propales.php','enabledbydefaulton'=>'Home'),
|
||||
);
|
||||
|
||||
// Permissions
|
||||
$this->rights = array();
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
6.0.021 (2013-07-18)
|
||||
- The bug caused by the preg_split function on some PHP 5.2.x versions was fixed.
|
||||
|
||||
6.0.020 (2013-06-04)
|
||||
- The method addTTFfont() was fixed (Bug item #813 Undefined offset).
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 6.0.020
|
||||
Release date: 2013-06-04
|
||||
Version: 6.0.021
|
||||
Release date: 2013-07-18
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2002-2013:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tecnick.com/tcpdf",
|
||||
"version": "6.0.020",
|
||||
"version": "6.0.021",
|
||||
"homepage": "http://www.tcpdf.org/",
|
||||
"type": "library",
|
||||
"description": "TCPDF is a PHP class for generating PDF documents.",
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf_fonts.php
|
||||
// Version : 1.0.007
|
||||
// Version : 1.0.008
|
||||
// Begin : 2008-01-01
|
||||
// Last Update : 2013-06-04
|
||||
// Last Update : 2013-07-18
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
@ -42,7 +42,7 @@
|
||||
* @class TCPDF_FONTS
|
||||
* Font methods for TCPDF library.
|
||||
* @package com.tecnick.tcpdf
|
||||
* @version 1.0.007
|
||||
* @version 1.0.008
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF_FONTS {
|
||||
@ -1815,7 +1815,7 @@ class TCPDF_FONTS {
|
||||
// characters.
|
||||
return 0xFFFD; // use replacement character
|
||||
} else {
|
||||
return $char; // add char to array
|
||||
return $char;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@ -1839,17 +1839,7 @@ class TCPDF_FONTS {
|
||||
public static function UTF8StringToArray($str, $isunicode=true, &$currentfont) {
|
||||
if ($isunicode) {
|
||||
// requires PCRE unicode support turned on
|
||||
$chars = preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY);
|
||||
// DOL_CHANGE_LDR - FIX BUG WITH PHP 5.2.4
|
||||
if (count(preg_split('//u', "\nx", -1, PREG_SPLIT_NO_EMPTY)) == 1) // If function preg_split is bugged
|
||||
{
|
||||
$tmp=array();
|
||||
$len = mb_strlen($str, "UTF-8");
|
||||
for ($i = 0; $i < $len; $i++) {
|
||||
$tmp[] = mb_substr($str, $i, 1, "UTF-8");
|
||||
}
|
||||
$chars=$tmp;
|
||||
}
|
||||
$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
|
||||
$carr = array_map(array('self', 'uniord'), $chars);
|
||||
} else {
|
||||
$chars = str_split($str);
|
||||
|
||||
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
||||
* Current TCPDF version.
|
||||
* @private static
|
||||
*/
|
||||
private static $tcpdf_version = '6.0.020';
|
||||
private static $tcpdf_version = '6.0.021';
|
||||
|
||||
/**
|
||||
* String alias for total number of pages.
|
||||
@ -2723,6 +2723,37 @@ class TCPDF_STATIC {
|
||||
return $angle;
|
||||
}
|
||||
|
||||
/**
|
||||
* Split string by a regular expression.
|
||||
* This is a wrapper for the preg_split function to avoid the bug: https://bugs.php.net/bug.php?id=45850
|
||||
* @param $pattern (string) The regular expression pattern to search for without the modifiers, as a string.
|
||||
* @param $modifiers (string) The modifiers part of the pattern,
|
||||
* @param $subject (string) The input string.
|
||||
* @param $limit (int) If specified, then only substrings up to limit are returned with the rest of the string being placed in the last substring. A limit of -1, 0 or NULL means "no limit" and, as is standard across PHP, you can use NULL to skip to the flags parameter.
|
||||
* @param $flags (int) The flags as specified on the preg_split PHP function.
|
||||
* @return Returns an array containing substrings of subject split along boundaries matched by pattern.modifier
|
||||
* @author Nicola Asuni
|
||||
* @since 6.0.021
|
||||
* @public static
|
||||
*/
|
||||
public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
|
||||
// the bug only happens on PHP 5.2 when using the u modifier
|
||||
if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
|
||||
return preg_split($pattern.$modifiers, $subject, $limit, $flags);
|
||||
}
|
||||
// preg_split is bugged - try alternative solution
|
||||
$ret = array();
|
||||
while (($nl = strpos($subject, "\n")) !== FALSE) {
|
||||
$ret = array_merge($ret, preg_split($pattern.$modifiers, substr($subject, 0, $nl), $limit, $flags));
|
||||
$ret[] = "\n";
|
||||
$subject = substr($subject, ($nl + 1));
|
||||
}
|
||||
if (!empty($subject)) {
|
||||
$ret = array_merge($ret, preg_split($pattern.$modifiers, $subject, $limit, $flags));
|
||||
}
|
||||
return $ret;
|
||||
}
|
||||
|
||||
} // END OF TCPDF_STATIC CLASS
|
||||
|
||||
//============================================================+
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 6.0.020
|
||||
// Version : 6.0.021
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2013-06-04
|
||||
// Last Update : 2013-07-18
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
@ -139,7 +139,7 @@
|
||||
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 6.0.020
|
||||
* @version 6.0.021
|
||||
*/
|
||||
|
||||
// TCPDF configuration
|
||||
@ -163,7 +163,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
|
||||
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @brief PHP class for generating PDF documents without requiring external extensions.
|
||||
* @version 6.0.020
|
||||
* @version 6.0.021
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF {
|
||||
@ -6494,7 +6494,7 @@ class TCPDF {
|
||||
}
|
||||
// check the length of the next string
|
||||
$strrest = TCPDF_FONTS::UniArrSubString($uchars, ($sep + $endspace));
|
||||
$nextstr = preg_split('/'.$this->re_space['p'].'/'.$this->re_space['m'], $this->stringTrim($strrest));
|
||||
$nextstr = TCPDF_STATIC::pregSplit('/'.$this->re_space['p'].'/', $this->re_space['m'], $this->stringTrim($strrest));
|
||||
if (isset($nextstr[0]) AND ($this->GetStringWidth($nextstr[0]) > $pw)) {
|
||||
// truncate the word because do not fit on a full page width
|
||||
$tmpstr = TCPDF_FONTS::UniArrSubString($uchars, $j, $i);
|
||||
@ -18149,7 +18149,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
$tmp_fontsize = isset($dom[$nkey]['fontsize']) ? $dom[$nkey]['fontsize'] : $this->FontSizePt;
|
||||
$same_textdir = ($dom[$nkey]['dir'] == $dom[$key]['dir']);
|
||||
} else {
|
||||
$nextstr = preg_split('/'.$this->re_space['p'].'+/'.$this->re_space['m'], $dom[$nkey]['value']);
|
||||
$nextstr = TCPDF_STATIC::pregSplit('/'.$this->re_space['p'].'+/', $this->re_space['m'], $dom[$nkey]['value']);
|
||||
if (isset($nextstr[0]) AND $same_textdir) {
|
||||
$wadj += $this->GetStringWidth($nextstr[0], $tmp_fontname, $tmp_fontstyle, $tmp_fontsize);
|
||||
if (isset($nextstr[1])) {
|
||||
@ -18162,7 +18162,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
||||
}
|
||||
if (($wadj > 0) AND (($strlinelen + $wadj) >= $cwa)) {
|
||||
$wadj = 0;
|
||||
$nextstr = preg_split('/'.$this->re_space['p'].'/'.$this->re_space['m'], $dom[$key]['value']);
|
||||
$nextstr = TCPDF_STATIC::pregSplit('/'.$this->re_space['p'].'/', $this->re_space['m'], $dom[$key]['value']);
|
||||
$numblks = count($nextstr);
|
||||
if ($numblks > 1) {
|
||||
// try to split on blank spaces
|
||||
|
||||
@ -85,6 +85,7 @@ ClassifyCanceled=Classify 'Abandoned'
|
||||
ClassifyClosed=Classify 'Closed'
|
||||
CreateBill=Create Invoice
|
||||
AddBill=Add invoice or credit note
|
||||
AddToDraftInvoices=Add to draft invoice
|
||||
DeleteBill=Delete invoice
|
||||
SearchACustomerInvoice=Search for a customer invoice
|
||||
SearchASupplierInvoice=Search for a supplier invoice
|
||||
@ -199,6 +200,7 @@ StandingOrders=Standing orders
|
||||
StandingOrder=Standing order
|
||||
NoDraftBills=No draft invoices
|
||||
NoOtherDraftBills=No other draft invoices
|
||||
NoDraftInvoices=No draft invoices
|
||||
RefBill=Invoice ref
|
||||
ToBill=To bill
|
||||
RemainderToBill=Remainder to bill
|
||||
|
||||
@ -70,9 +70,11 @@ CancelOrder=Cancel order
|
||||
AddOrder=Add order
|
||||
AddToMyOrders=Add to my orders
|
||||
AddToOtherOrders=Add to other orders
|
||||
AddToDraftOrders=Add to draft order
|
||||
ShowOrder=Show order
|
||||
NoOpenedOrders=No opened orders
|
||||
NoOtherOpenedOrders=No other opened orders
|
||||
NoDraftOrders=No draft orders
|
||||
OtherOrders=Other orders
|
||||
LastOrders=Last %s orders
|
||||
LastModifiedOrders=Last %s modified orders
|
||||
|
||||
@ -71,6 +71,8 @@ ErrorPropalNotFound=Propal %s not found
|
||||
Estimate=Estimate :
|
||||
EstimateShort=Estimate
|
||||
OtherPropals=Other proposals
|
||||
AddToDraftProposals=Add to draft proposal
|
||||
NoDraftProposals=No draft proposals
|
||||
CopyPropalFrom=Create commercial proposal by copying existing proposal
|
||||
CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services
|
||||
DefaultProposalDurationValidity=Default commercial proposal validity duration (in days)
|
||||
|
||||
@ -37,4 +37,5 @@ AddCustomerInvoice=Create customer invoice
|
||||
AddSupplierOrder=Create supplier order
|
||||
AddSupplierInvoice=Create supplier invoice
|
||||
ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
|
||||
NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
|
||||
NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
|
||||
SentToSuppliers=Sent to suppliers
|
||||
@ -80,6 +80,7 @@ ClassifyCanceled=Classer 'Abandonnée'
|
||||
ClassifyClosed=Classer 'Fermée'
|
||||
CreateBill=Créer Facture
|
||||
AddBill=Créer facture ou avoir
|
||||
AddToDraftInvoices=Ajouter à facture brouillon
|
||||
DeleteBill=Supprimer facture
|
||||
SearchACustomerInvoice=Rechercher une facture client
|
||||
SearchASupplierInvoice=Rechercher une facture fournisseur
|
||||
@ -194,6 +195,7 @@ StandingOrders=Prélèvements
|
||||
StandingOrder=Prélèvement
|
||||
NoDraftBills=Pas de facture brouillon
|
||||
NoOtherDraftBills=Pas d'autre facture brouillon
|
||||
NoDraftInvoices=Pas de factures brouillons
|
||||
RefBill=Réf facture
|
||||
ToBill=À facturer
|
||||
RemainderToBill=Reste à facturer
|
||||
|
||||
@ -70,9 +70,11 @@ CancelOrder=Annuler la commande
|
||||
AddOrder=Créer commande
|
||||
AddToMyOrders=Ajouter à mes commandes
|
||||
AddToOtherOrders=Ajouter aux autres commandes
|
||||
AddToDraftOrders=Ajouter à commande brouillon
|
||||
ShowOrder=Afficher commande
|
||||
NoOpenedOrders=Pas de commande brouillon
|
||||
NoOtherOpenedOrders=Pas d'autre commande brouillon
|
||||
NoOpenedOrders=Pas de commande ouvertes
|
||||
NoOtherOpenedOrders=Pas d'autre commandes ouvertes
|
||||
NoDraftOrders=Pas de commandes brouillons
|
||||
OtherOrders=Autres commandes
|
||||
LastOrders=Les %s dernières commandes
|
||||
LastModifiedOrders=Les %s dernières commandes modifiées
|
||||
|
||||
@ -71,6 +71,8 @@ ErrorPropalNotFound=Propale %s inexistante
|
||||
Estimate=Devis :
|
||||
EstimateShort=Devis
|
||||
OtherPropals=Autres propositions
|
||||
AddToDraftProposals=Ajouter à proposition brouillon
|
||||
NoDraftProposals=Pas de propositions brouillons
|
||||
CopyPropalFrom=Créer proposition/devis par recopie d'un proposition existante
|
||||
CreateEmptyPropal=Créer proposition/devis vierge
|
||||
DefaultProposalDurationValidity=Délai de validité par défaut (en jours)
|
||||
|
||||
@ -38,3 +38,4 @@ AddSupplierOrder=Créer commande fournisseur
|
||||
AddSupplierInvoice=Créer facture fournisseur
|
||||
ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b>
|
||||
NoneOrBatchFileNeverRan=Aucun ou traitement par lot <b>%s</b> non exécuté récemment
|
||||
SentToSuppliers=Envoyés aux fournisseurs
|
||||
|
||||
@ -1338,7 +1338,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
|
||||
$langs->load("propal");
|
||||
|
||||
$html .= '<tr class="liste_titre">';
|
||||
$html .= '<td class="liste_titre">'.$langs->trans("AddToOtherProposals").'</td>';
|
||||
$html .= '<td class="liste_titre">'.$langs->trans("AddToDraftProposals").'</td>';
|
||||
$html .= '</tr><tr>';
|
||||
$html .= '<td valign="top">';
|
||||
|
||||
@ -1365,7 +1365,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
|
||||
else
|
||||
{
|
||||
$html .= "<tr ".$bc[!$var]."><td>";
|
||||
$html .= $langs->trans("NoOtherOpenedPropals");
|
||||
$html .= $langs->trans("NoDraftProposals");
|
||||
$html .= '</td></tr>';
|
||||
}
|
||||
$html .= '</table>';
|
||||
@ -1383,7 +1383,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
|
||||
$langs->load("orders");
|
||||
|
||||
$html .= '<tr class="liste_titre">';
|
||||
$html .= '<td class="liste_titre">'.$langs->trans("AddToOtherOrders").'</td>';
|
||||
$html .= '<td class="liste_titre">'.$langs->trans("AddToDraftOrders").'</td>';
|
||||
$html .= '</tr><tr>';
|
||||
$html .= '<td valign="top">';
|
||||
|
||||
@ -1410,7 +1410,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
|
||||
else
|
||||
{
|
||||
$html .= "<tr ".$bc[!$var]."><td>";
|
||||
$html .= $langs->trans("NoOtherOpenedOrders");
|
||||
$html .= $langs->trans("NoDraftOrders");
|
||||
$html .= '</td></tr>';
|
||||
}
|
||||
$html .= '</table>';
|
||||
@ -1428,7 +1428,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
|
||||
$langs->load("bills");
|
||||
|
||||
$html .= '<tr class="liste_titre">';
|
||||
$html .= '<td class="liste_titre">'.$langs->trans("AddToOtherBills").'</td>';
|
||||
$html .= '<td class="liste_titre">'.$langs->trans("AddToDraftInvoices").'</td>';
|
||||
$html .= '</tr><tr>';
|
||||
$html .= '<td valign="top">';
|
||||
|
||||
@ -1455,7 +1455,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status)
|
||||
else
|
||||
{
|
||||
$html .= "<tr ".$bc[!$var]."><td>";
|
||||
$html .= $langs->trans("NoOtherDraftBills");
|
||||
$html .= $langs->trans("NoDraftInvoices");
|
||||
$html .= '</td></tr>';
|
||||
}
|
||||
$html .= '</table>';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user