2
0
forked from Wavyzz/dolibarr
This commit is contained in:
Laurent Destailleur
2011-07-04 08:53:01 +00:00
parent 4f221935ac
commit 72d6a714f5
7 changed files with 61 additions and 61 deletions

View File

@@ -29,7 +29,7 @@
* \file htdocs/core/class/html.formother.class.php * \file htdocs/core/class/html.formother.class.php
* \ingroup core * \ingroup core
* \brief Fichier de la classe des fonctions predefinie de composants html autre * \brief Fichier de la classe des fonctions predefinie de composants html autre
* \version $Id: html.formother.class.php,v 1.16 2011/06/26 09:32:13 hregis Exp $ * \version $Id: html.formother.class.php,v 1.17 2011/07/04 08:53:01 eldy Exp $
*/ */
@@ -653,7 +653,8 @@ class FormOther
* @param $parent * @param $parent
* @param $lines * @param $lines
* @param $level * @param $level
* @param $selected * @param $selectedtask
* @param $selectedproject
*/ */
function PLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selectedproject=0) function PLineSelect(&$inc, $parent, $lines, $level=0, $selectedtask=0, $selectedproject=0)
{ {

View File

@@ -21,7 +21,7 @@
* \file htdocs/imports/import.php * \file htdocs/imports/import.php
* \ingroup import * \ingroup import
* \brief Pages of import Wizard * \brief Pages of import Wizard
* \version $Id$ * \version $Id: import.php,v 1.66 2011/07/04 08:53:01 eldy Exp $
*/ */
require_once("../main.inc.php"); require_once("../main.inc.php");
@@ -1669,7 +1669,7 @@ print '<br>';
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date: 2011/07/04 08:53:01 $ - $Revision: 1.66 $');
/* /*
@@ -1729,8 +1729,8 @@ function show_elem($fieldssource,$i,$pos,$key,$var,$nostyle='')
/** /**
* Return not used field number * Return not used field number
* * @param $fieldssource
* @param $listofkey * @param $listofkey
* @return * @return
*/ */
function getnewkey(&$fieldssource,&$listofkey) function getnewkey(&$fieldssource,&$listofkey)

View File

@@ -24,7 +24,7 @@
* \file htdocs/includes/modules/member/cards/modules_cards.php * \file htdocs/includes/modules/member/cards/modules_cards.php
* \ingroup member * \ingroup member
* \brief File of parent class of document generator for members cards. * \brief File of parent class of document generator for members cards.
* \version $Id$ * \version $Id: modules_cards.php,v 1.10 2011/07/04 08:53:01 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
@@ -61,13 +61,12 @@ class ModelePDFCards
/** /**
* \brief Cree un fichier de cartes de visites en fonction du modele de ADHERENT_CARDS_ADDON_PDF * Cree un fichier de cartes de visites en fonction du modele de ADHERENT_CARDS_ADDON_PDF
* \param db objet base de donnee * @param db Database handler
* \param id id de la facture a creer * @param arrayofmembers Array of members
* \param message message * @param modele Force modele to use ('' to not force)
* \param modele force le modele a utiliser ('' to not force) * @param outputlangs Objet langs to use for translation
* \param outputlangs objet lang a utiliser pour traduction * @return int <0 if KO, >0 if OK
* \return int <0 if KO, >0 if OK
*/ */
function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs) function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs)
{ {

View File

@@ -24,7 +24,7 @@
* \ingroup propale * \ingroup propale
* \brief Fichier contenant la classe mere de generation des propales en PDF * \brief Fichier contenant la classe mere de generation des propales en PDF
* et la classe mere de numerotation des propales * et la classe mere de numerotation des propales
* \version $Id$ * \version $Id: modules_propale.php,v 1.61 2011/07/04 08:53:01 eldy Exp $
*/ */
require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
@@ -132,10 +132,10 @@ class ModeleNumRefPropales
/** /**
* Cree une propale sur disque en fonction du modele de PROPALE_ADDON_PDF * Cree une propale sur disque en fonction du modele de PROPALE_ADDON_PDF
* @param db objet base de donnee * @param db Database handler
* @param id id de la propale a creer * @param object Object proposal
* @param modele force le modele a utiliser ('' to not force) * @param modele Force model to use ('' to not force)
* @param outputlangs objet lang a utiliser pour traduction * @param outputlangs Object langs to use for output
* @param hidedetails Hide details of lines * @param hidedetails Hide details of lines
* @param hidedesc Hide description * @param hidedesc Hide description
* @param hideref Hide ref * @param hideref Hide ref

View File

@@ -29,7 +29,7 @@
* \file htdocs/lib/functions.lib.php * \file htdocs/lib/functions.lib.php
* \brief A set of functions for Dolibarr * \brief A set of functions for Dolibarr
* This file contains all frequently used functions. * This file contains all frequently used functions.
* \version $Id: functions.lib.php,v 1.536 2011/07/04 08:38:51 eldy Exp $ * \version $Id: functions.lib.php,v 1.537 2011/07/04 08:53:01 eldy Exp $
*/ */
// For compatibility during upgrade // For compatibility during upgrade
@@ -2766,7 +2766,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
* @param file Lien * @param file Lien
* @param options Autres parametres d'url a propager dans les liens ("" par defaut) * @param options Autres parametres d'url a propager dans les liens ("" par defaut)
* @param nextpage Faut-il une page suivante * @param nextpage Faut-il une page suivante
* @param betweenarraows HTML Content to show between arrows * @param betweenarrows HTML Content to show between arrows
*/ */
function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrows='') function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrows='')
{ {
@@ -3523,7 +3523,7 @@ function dol_nboflines($s,$maxchar=0)
/** /**
* Return nb of lines of a formated text with \n and <br> * Return nb of lines of a formated text with \n and <br>
* @param texte Text * @param text Text
* @param maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut) * @param maxlinesize Largeur de ligne en caracteres (ou 0 si pas de limite - defaut)
* @param charset Give the charset used to encode the $text variable in memory. * @param charset Give the charset used to encode the $text variable in memory.
* @return int Number of lines * @return int Number of lines
@@ -3905,11 +3905,11 @@ function dol_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
* ascending (default) or descending output and uses optionally * ascending (default) or descending output and uses optionally
* natural case insensitive sorting (which can be optionally case * natural case insensitive sorting (which can be optionally case
* sensitive as well). * sensitive as well).
* @param array Array to sort * @param array Array to sort
* @param index * @param index
* @param order * @param order
* @param natsort * @param natsort
* @param cas_sensitive * @param case_sensitive Sort is case sensitive
* @return Sorted array * @return Sorted array
*/ */
function dol_sort_array(&$array, $index, $order='asc', $natsort, $case_sensitive) function dol_sort_array(&$array, $index, $order='asc', $natsort, $case_sensitive)

View File

@@ -25,7 +25,7 @@
* \file htdocs/lib/pdf.lib.php * \file htdocs/lib/pdf.lib.php
* \brief Set of functions used for PDF generation * \brief Set of functions used for PDF generation
* \ingroup core * \ingroup core
* \version $Id: pdf.lib.php,v 1.95 2011/06/30 13:27:21 hregis Exp $ * \version $Id: pdf.lib.php,v 1.96 2011/07/04 08:53:01 eldy Exp $
*/ */
@@ -682,7 +682,7 @@ function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hide
* Return line description translated in outputlangs and encoded in UTF8 * Return line description translated in outputlangs and encoded in UTF8
* @param object Object * @param object Object
* @param i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hideref Hide reference * @param hideref Hide reference
* @param hidedesc Hide description * @param hidedesc Hide description
* @param issupplierline Is it a line for a supplier object ? * @param issupplierline Is it a line for a supplier object ?
@@ -814,7 +814,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl
* Return line num * Return line num
* @param object Object * @param object Object
* @param $i Current line number * @param $i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
*/ */
function pdf_getlinenum($object,$i,$outputlangs) function pdf_getlinenum($object,$i,$outputlangs)
{ {
@@ -854,8 +854,8 @@ function pdf_getlineref($object,$i,$outputlangs)
/** /**
* Return line ref_supplier * Return line ref_supplier
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
*/ */
function pdf_getlineref_supplier($object,$i,$outputlangs) function pdf_getlineref_supplier($object,$i,$outputlangs)
{ {
@@ -874,8 +874,8 @@ function pdf_getlineref_supplier($object,$i,$outputlangs)
/** /**
* Return line vat rate * Return line vat rate
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -901,8 +901,8 @@ function pdf_getlinevatrate($object,$i,$outputlangs,$hidedetails=0)
/** /**
* Return line unit price excluding tax * Return line unit price excluding tax
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -928,8 +928,8 @@ function pdf_getlineupexcltax($object,$i,$outputlangs,$hidedetails=0)
/** /**
* Return line quantity * Return line quantity
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -958,8 +958,8 @@ function pdf_getlineqty($object,$i,$outputlangs,$hidedetails=0)
/** /**
* Return line quantity asked * Return line quantity asked
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -988,8 +988,8 @@ function pdf_getlineqty_asked($object,$i,$outputlangs,$hidedetails=0)
/** /**
* Return line quantity shipped * Return line quantity shipped
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -1018,8 +1018,8 @@ function pdf_getlineqty_shipped($object,$i,$outputlangs,$hidedetails=0)
/** /**
* Return line keep to ship quantity * Return line keep to ship quantity
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -1048,8 +1048,8 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0)
/** /**
* Return line remise percent * Return line remise percent
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -1080,8 +1080,8 @@ function pdf_getlineremisepercent($object,$i,$outputlangs,$hidedetails=0)
/** /**
* Return line total excluding tax * Return line total excluding tax
* @param object Object * @param object Object
* @param $i Current line number * @param i Current line number
* @param outputlang Object lang for output * @param outputlangs Object langs for output
* @param hidedetails Hide value * @param hidedetails Hide value
* 0 = no * 0 = no
* 1 = yes * 1 = yes
@@ -1115,7 +1115,7 @@ function pdf_getlinetotalexcltax($object,$i,$outputlangs,$hidedetails=0)
* Return total quantity of products and/or services * Return total quantity of products and/or services
* @param object Object * @param object Object
* @param type Type of line (all=all, 0=product, 1=service, 9=other) * @param type Type of line (all=all, 0=product, 1=service, 9=other)
* @param outputlang Object lang for output * @param outputlangs Object langs for output
*/ */
function pdf_getTotalQty($object,$type='',$outputlangs) function pdf_getTotalQty($object,$type='',$outputlangs)
{ {

View File

@@ -26,7 +26,7 @@
* \file htdocs/main.inc.php * \file htdocs/main.inc.php
* \ingroup core * \ingroup core
* \brief File that defines environment for Dolibarr pages only (variables not required by scripts) * \brief File that defines environment for Dolibarr pages only (variables not required by scripts)
* \version $Id: main.inc.php,v 1.748 2011/07/03 13:16:46 hregis Exp $ * \version $Id: main.inc.php,v 1.749 2011/07/04 08:53:01 eldy Exp $
*/ */
@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
@@ -814,22 +814,22 @@ if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY))
// Functions // Functions
/**
* Show HTML header HTML + BODY + Top menu + left menu + DIV
* @param head Add optionnal head lines
* @param title Title of web page
* @param help_url Url links to help page
* Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
* For other external page: http://server/url
* @param target Target to use in menu links
* @param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
* @param disablehead Do not output head section
* @param arrayofjs Array of js files to add in header
* @param arrayofcss Array of css files to add in header
* @param morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails)
*/
if (! function_exists("llxHeader")) if (! function_exists("llxHeader"))
{ {
/**
* Show HTML header HTML + BODY + Top menu + left menu + DIV
* @param head Add optionnal head lines
* @param title Title of web page
* @param help_url Url links to help page
* Syntax is: For a wiki page: EN:EnglishPage|FR:FrenchPage|ES:SpanishPage
* For other external page: http://server/url
* @param target Target to use in menu links
* @param disablejs Do not output links to js (Ex: qd fonction utilisee par sous formulaire Ajax)
* @param disablehead Do not output head section
* @param arrayofjs Array of js files to add in header
* @param arrayofcss Array of css files to add in header
* @param morequerystring Query string to add to the link "print" to get same parameters (use only if autodetect fails)
*/
function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='') function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='', $morequerystring='')
{ {
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers