diff --git a/build/debian/README.howto b/build/debian/README.howto index 3eae2a48b5d..44cfb21ab81 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -109,3 +109,6 @@ git-buildpackage --git-tag git push git push --tags +* Then ??? +http://packages.qa.debian.org/t/tcpdf.html + diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 50676b17ec4..b57124da396 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -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) diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 85bbaae9ef2..35f3f766389 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -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'; } diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index c575e7154c2..e81b0db6dfc 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -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 diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php index 29f765e0c42..987c224d423 100644 --- a/htdocs/core/boxes/box_graph_orders_permonth.php +++ b/htdocs/core/boxes/box_graph_orders_permonth.php @@ -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"); diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php new file mode 100644 index 00000000000..59b778983a7 --- /dev/null +++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php @@ -0,0 +1,225 @@ + + * + * 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 . + */ + +/** + * \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 ='
'; + $stringtoshow.='
'; + } + if ($shownb) $stringtoshow.=$px1->show(); + if ($shownb && $showtot) + { + $stringtoshow.='
'; + $stringtoshow.='
'; + } + if ($showtot) $stringtoshow.=$px2->show(); + if ($shownb && $showtot) + { + $stringtoshow.='
'; + $stringtoshow.='
'; + } + $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); + } + +} + +?> diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php new file mode 100644 index 00000000000..da564fb4c71 --- /dev/null +++ b/htdocs/core/boxes/box_graph_propales_permonth.php @@ -0,0 +1,225 @@ + + * + * 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 . + */ + +/** + * \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 ='
'; + $stringtoshow.='
'; + } + if ($shownb) $stringtoshow.=$px1->show(); + if ($shownb && $showtot) + { + $stringtoshow.='
'; + $stringtoshow.='
'; + } + if ($showtot) $stringtoshow.=$px2->show(); + if ($shownb && $showtot) + { + $stringtoshow.='
'; + $stringtoshow.='
'; + } + $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); + } + +} + +?> diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1be018f61a9..81f564254a1 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -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.=''.$links[$i][1].''."\n"; + $out.=''.$links[$i][1].''."\n"; } else { - $out.=''.$links[$i][1].''."\n"; + $out.=''.$links[$i][1].''."\n"; } } $out.=''; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 041234bf206..2b01ce15413 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -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 ''; $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)) diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 790f4a441ee..e1db74968a4 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -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 diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index d3a5bb8509a..0e3d6d689d2 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -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(); diff --git a/htdocs/includes/tcpdf/CHANGELOG.TXT b/htdocs/includes/tcpdf/CHANGELOG.TXT index 213e4792e8b..6b87acf05cc 100644 --- a/htdocs/includes/tcpdf/CHANGELOG.TXT +++ b/htdocs/includes/tcpdf/CHANGELOG.TXT @@ -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). diff --git a/htdocs/includes/tcpdf/README.TXT b/htdocs/includes/tcpdf/README.TXT index 3e1ee6203b4..ad384c4a761 100644 --- a/htdocs/includes/tcpdf/README.TXT +++ b/htdocs/includes/tcpdf/README.TXT @@ -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: diff --git a/htdocs/includes/tcpdf/composer.json b/htdocs/includes/tcpdf/composer.json index 7a3c2225ebb..be0dac59cd6 100644 --- a/htdocs/includes/tcpdf/composer.json +++ b/htdocs/includes/tcpdf/composer.json @@ -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.", diff --git a/htdocs/includes/tcpdf/include/tcpdf_fonts.php b/htdocs/includes/tcpdf/include/tcpdf_fonts.php index da649e15e92..5a384f85059 100644 --- a/htdocs/includes/tcpdf/include/tcpdf_fonts.php +++ b/htdocs/includes/tcpdf/include/tcpdf_fonts.php @@ -1,9 +1,9 @@ * @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.
* @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 diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index f8491dd53ac..82abde453c1 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -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 diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index db5be3df9c9..393678ed4c4 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -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 diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang index ffc042dfa00..a54bdfb0b2b 100644 --- a/htdocs/langs/en_US/propal.lang +++ b/htdocs/langs/en_US/propal.lang @@ -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) diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 898035611b2..acabe2529ae 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -37,4 +37,5 @@ AddCustomerInvoice=Create customer invoice AddSupplierOrder=Create supplier order AddSupplierInvoice=Create supplier invoice ListOfSupplierProductForSupplier=List of products and prices for supplier %s -NoneOrBatchFileNeverRan=None or batch %s not ran recently \ No newline at end of file +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers \ No newline at end of file diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index debbe4f4d33..c27aeb340c4 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -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 diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index c5569128e7a..1091b4c2844 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -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 diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang index f826113b310..544c55eacc7 100644 --- a/htdocs/langs/fr_FR/propal.lang +++ b/htdocs/langs/fr_FR/propal.lang @@ -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) diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index b6e6a93b1db..3564dd0332d 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -38,3 +38,4 @@ AddSupplierOrder=Créer commande fournisseur AddSupplierInvoice=Créer facture fournisseur ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs %s NoneOrBatchFileNeverRan=Aucun ou traitement par lot %s non exécuté récemment +SentToSuppliers=Envoyés aux fournisseurs diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index dd42134ee2d..c5aa1916f70 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -1338,7 +1338,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) $langs->load("propal"); $html .= ''; - $html .= ''; + $html .= ''; $html .= ''; $html .= ''; } $html .= '
'.$langs->trans("AddToOtherProposals").''.$langs->trans("AddToDraftProposals").'
'; @@ -1365,7 +1365,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) else { $html .= "
"; - $html .= $langs->trans("NoOtherOpenedPropals"); + $html .= $langs->trans("NoDraftProposals"); $html .= '
'; @@ -1383,7 +1383,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) $langs->load("orders"); $html .= ''; - $html .= ''.$langs->trans("AddToOtherOrders").''; + $html .= ''.$langs->trans("AddToDraftOrders").''; $html .= ''; $html .= ''; @@ -1410,7 +1410,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) else { $html .= ""; - $html .= $langs->trans("NoOtherOpenedOrders"); + $html .= $langs->trans("NoDraftOrders"); $html .= ''; } $html .= ''; @@ -1428,7 +1428,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) $langs->load("bills"); $html .= ''; - $html .= ''.$langs->trans("AddToOtherBills").''; + $html .= ''.$langs->trans("AddToDraftInvoices").''; $html .= ''; $html .= ''; @@ -1455,7 +1455,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) else { $html .= ""; - $html .= $langs->trans("NoOtherDraftBills"); + $html .= $langs->trans("NoDraftInvoices"); $html .= ''; } $html .= '';