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

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

Browse Source
This commit is contained in:
Florian HENRY 2014-09-29 10:52:47 +02:00
commit 0ee9049374
124 changed files with 284 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/debian/changelog
View File

@ -1,3 +1,10 @@
dolibarr (3.6.1-3) unstable; urgency=low
[ Laurent Destailleur (eldy) ]
* New upstream release.
-- Laurent Destailleur (eldy) <eldy@users.sourceforge.net> Tue, 23 Sep 2014 12:00:00 +0100
dolibarr (3.6.0-3) unstable; urgency=low
[ Laurent Destailleur (eldy) ]

4
build/exe/doliwamp/doliwamp.iss
View File

@ -17,9 +17,9 @@
; ----- Change this -----
AppName=DoliWamp
; DoliWamp-x.x.x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
AppVerName=DoliWamp-3.6.0
AppVerName=DoliWamp-3.6.1
; DoliWamp-x.x x or DoliWamp-x.x.x-alpha or DoliWamp-x.x.x-beta or DoliWamp-x.x.x-rc or DoliWamp-x.x.x
OutputBaseFilename=DoliWamp-3.6.0
OutputBaseFilename=DoliWamp-3.6.1
; ----- End of change
;OutputManifestFile=build\doliwampbuild.log
; Define full path from which all relative path are defined

21
build/makepack-dolibarr.pl
View File

@ -460,8 +460,8 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/license.txt`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PCLZip`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`;
$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`;
$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/savant`;
@ -610,9 +610,6 @@ if ($nboftargetok) {
print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n";
#print "Create directory $RPMDIR\n";
#$ret=`mkdir -p "$RPMDIR"`;
print "Remove target ".$FILENAMERPM."...\n";
unlink("$NEWDESTI/".$FILENAMERPM);
print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n";
@ -620,13 +617,13 @@ if ($nboftargetok) {
print "Create directory $BUILDROOT/$FILENAMETGZ2\n";
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`;
print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n";
$cmd="cp -pr '$BUILDROOT/$PROJECT' '$BUILDROOT/$FILENAMETGZ2'";
$ret=`$cmd`;
# Set owners
#print "Set owners on files/dir\n";
#$ret=`chown -R root.root $BUILDROOT/$FILENAMETGZ2`;
# Removed files we don't need
$ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/htdocs/includes/ckeditor/_source`;
print "Set permissions on files/dir\n";
$ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`;
@ -747,10 +744,18 @@ if ($nboftargetok) {
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/rpm`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/build/zip`;
# Removed duplicate license files
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/LICENSE.md`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/scayt/LICENSE.md`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source/plugins/wsc/LICENSE.md`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/LICENSE.md`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/scayt/LICENSE.md`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/plugins/wsc/LICENSE.md`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/jquery/plugins/flot/LICENSE.txt`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE`;
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING`;
# Removed files we don't need
$ret=`rm -fr $BUILDROOT/$PROJECT.tmp/htdocs/includes/ckeditor/_source`;
# Rename upstream changelog to match debian rules
$ret=`mv $BUILDROOT/$PROJECT.tmp/ChangeLog $BUILDROOT/$PROJECT.tmp/changelog`;

3
build/makepack-howto.txt
View File

@ -36,14 +36,13 @@ complete release of Dolibarr, step by step.
- Update version number with x.y.z in build/exe/doliwamp/doliwamp.iss
- Update version number with x.y.z in build/rpm/*.spec
- Commit all changes.
- Add a Tag (x.y.z)
- Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl
- Check content of built packages.
- Move build files into www.dolibarr.org web site
(/home/dolibarr/wwwroot/files/stable).
- Run makepack-dolibarr.pl again with option to publish files on
sourceforge.
sourceforge. This will also add official tag.
- Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx"
on server to point to new files (used by some web sites).

3
build/rpm/dolibarr_fedora.spec
View File

@ -333,6 +333,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release

3
build/rpm/dolibarr_generic.spec
View File

@ -569,6 +569,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release

3
build/rpm/dolibarr_mandriva.spec
View File

@ -338,6 +338,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release

3
build/rpm/dolibarr_opensuse.spec
View File

@ -349,6 +349,9 @@ fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog
* Wed Sep 24 2014 Laurent Destailleur 3.6.1-0.3
- Upstream release
* Wed Jul 15 2014 Laurent Destailleur 3.6.0-0.3
- Upstream release

4
htdocs/adherents/canvas/actions_adherentcard_common.class.php
View File

@ -94,7 +94,7 @@ abstract class ActionsAdherentCardCommon
/**
* Load data control
*
* @param string &$action Type of action
* @param string $action Type of action
* @param int $id Id of object
* @return void
*/
@ -228,7 +228,7 @@ abstract class ActionsAdherentCardCommon
/**
* Set content of ->tpl array, to use into template
*
* @param string &$action Type of action
* @param string $action Type of action
* @param int $id Id
* @return string HTML output
*/

2
htdocs/adherents/canvas/default/actions_adherentcard_default.class.php
View File

@ -76,7 +76,7 @@ class ActionsAdherentCardDefault extends ActionsAdherentCardCommon
/**
* Assign custom values for canvas
*
* @param string &$action Type of action
* @param string $action Type of action
* @param int $id Id
* @return void
*/

1
htdocs/admin/commande.php
View File

@ -534,4 +534,3 @@ print '<br>';
llxFooter();
$db->close();
?>

1
htdocs/admin/menus/other.php
View File

@ -143,4 +143,3 @@ print '</table>';
llxFooter();
$db->close();
?>

6
htdocs/admin/stock.php
View File

@ -77,7 +77,7 @@ if($action)
if($action == 'STOCK_USE_VIRTUAL_STOCK') {
$res = dolibarr_set_const($db, "STOCK_USE_VIRTUAL_STOCK", GETPOST('STOCK_USE_VIRTUAL_STOCK','alpha'),'chaine',0,'',$conf->entity);
}
if($action == 'STOCK_MUST_BE_ENOUGH_FOR_INVOICE') {
$res = dolibarr_set_const($db, "STOCK_MUST_BE_ENOUGH_FOR_INVOICE", GETPOST('STOCK_MUST_BE_ENOUGH_FOR_INVOICE','alpha'),'chaine',0,'',$conf->entity);
}
@ -329,7 +329,7 @@ if ($virtualdiffersfromphysical)
print '</table>';
}
$db->close();
llxFooter();
?>
$db->close();

7
htdocs/admin/system/database.php
View File

@ -81,7 +81,7 @@ else
print '<td width="300">'.$langs->trans("Parameters").'</td>';
print '<td>'.$langs->trans("Value").'</td>';
print '</tr>'."\n";
// arraytest is an array of test to do
$arraytest=array();
if (preg_match('/mysql/i',$db->type))
@ -91,7 +91,7 @@ else
'collation_database'=>array('var'=>'dolibarr_main_db_collation','valifempty'=>'utf8_general_ci')
);
}
$listtouse=array();
if ($listname == 'listofvars') $listtouse=$listofvars;
if ($listname == 'listofstatus') $listtouse=$listofstatus;
@ -124,4 +124,5 @@ else
}
llxFooter();
?>
$db->close();

1
htdocs/admin/system/dbtable.php
View File

@ -130,4 +130,3 @@ else
llxFooter();
$db->close();
?>

1
htdocs/admin/system/dolibarr.php
View File

@ -379,4 +379,3 @@ print '</table>';
llxFooter();
$db->close();
?>

2
htdocs/admin/system/index.php
View File

@ -118,5 +118,3 @@ print info_admin($langs->trans("SystemInfoDesc")).'<br>';
llxFooter();
$db->close();
?>

1
htdocs/admin/tools/eaccelerator.php
View File

@ -350,4 +350,3 @@ print "<br><br>";
llxFooter();
$db->close();
?>

1
htdocs/admin/tools/purge.php
View File

@ -166,4 +166,3 @@ if (preg_match('/^confirm/i',$choice))
llxFooter();
$db->close();
?>

1
htdocs/admin/tools/update.php
View File

@ -174,4 +174,3 @@ if (! empty($result['return']))
llxFooter();
$db->close();
?>

1
htdocs/admin/translation.php
View File

@ -69,4 +69,3 @@ print $langs->trans("SeeAlso").': <a href="'.$urlwikitranslatordoc.'" target="_b
llxFooter();
$db->close();
?>

1
htdocs/admin/workflow.php
View File

@ -146,4 +146,3 @@ print '</table>';
llxFooter();
$db->close();
?>

1
htdocs/cashdesk/affIndex.php
View File

@ -75,4 +75,3 @@ include_once 'affPied.php';
print '</div></div></div>'."\n";
print '</body></html>'."\n";
?>

2
htdocs/cashdesk/facturation.php
View File

@ -191,5 +191,3 @@ $obj_facturation->paiementLe('RESET');
// Affichage des templates
require ('tpl/facturation1.tpl.php');
?>

1
htdocs/cashdesk/tpl/menu.tpl.php
View File

@ -78,4 +78,3 @@ if (!empty($_SESSION["CASHDESK_ID_WAREHOUSE"]) && ! empty($conf->stock->enabled)
}
print '</li></ul>';
print '</div>';
?>

1
htdocs/categories/viewcat.php
View File

@ -520,4 +520,3 @@ if($object->type == 4)
llxFooter();
$db->close();
?>

5
htdocs/comm/action/class/actioncomm.class.php
View File

@ -284,7 +284,7 @@ class ActionComm extends CommonObject
$sql.= " a.fk_user_action, a.fk_user_done,";
$sql.= " a.fk_contact, a.percent as percentage,";
$sql.= " a.fk_element, a.elementtype,";
$sql.= " a.priority, a.fulldayevent, a.location, a.transparency,";
$sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,";
$sql.= " c.id as type_id, c.code as type_code, c.libelle,";
$sql.= " s.nom as socname,";
$sql.= " u.firstname, u.lastname as lastname";
@ -878,7 +878,7 @@ class ActionComm extends CommonObject
$sql.= " a.fk_user_action, a.fk_user_done,";
$sql.= " a.fk_contact, a.percent as percentage,";
$sql.= " a.fk_element, a.elementtype,";
$sql.= " a.priority, a.fulldayevent, a.location,";
$sql.= " a.priority, a.fulldayevent, a.location, a.punctual, a.transparency,";
$sql.= " u.firstname, u.lastname,";
$sql.= " s.nom as socname,";
$sql.= " c.id as type_id, c.code as type_code, c.libelle";
@ -1071,4 +1071,3 @@ class ActionComm extends CommonObject
}
?>

2
htdocs/comm/action/index.php
View File

@ -966,7 +966,7 @@ llxFooter();
* @param int $year Year
* @param int $monthshown Current month shown in calendar view
* @param string $style Style to use for this day
* @param array &$eventarray Array of events
* @param array $eventarray Array of events
* @param int $maxprint Nb of actions to show each day on month view (0 means no limit)
* @param int $maxnbofchar Nb of characters to show for event line
* @param string $newparam Parameters on current URL

7
htdocs/comm/fiche.php
View File

@ -821,11 +821,11 @@ if ($id > 0)
/*
* Barre d'actions
*/
$parameters = array();
$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
print '<div class="tabsAction">';
if (! empty($conf->propal->enabled) && $user->rights->propal->creer)
@ -933,4 +933,3 @@ dol_htmloutput_mesg('',$mesgs);
// End of page
llxFooter();
$db->close();
?>

8
htdocs/commande/customer.php
View File

@ -156,7 +156,7 @@ if ($resql)
print "<tr ".$bc[$var].">";
print '<td>';
$result='';
$lien=$lienfin='';
$lien = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php',1).'?socid='.$obj->rowid.'">';
@ -164,7 +164,7 @@ if ($resql)
$name=$obj->nom;
$result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
$result.=$lien.(dol_trunc($name,$maxlen)).$lienfin;
print $result;
print '</td>';
print '<td>'.$obj->town.'&nbsp;</td>';
@ -185,7 +185,7 @@ else
dol_print_error($db);
}
llxFooter();
$db->close();
llxFooter();
?>

1
htdocs/compta/facture/apercu.php
View File

@ -420,4 +420,3 @@ elseif (file_exists($fileimagebis))
$db->close();
llxFooter();
?>

2
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -164,7 +164,7 @@ class BonPrelevement extends CommonObject
/**
* Add line to withdrawal
*
* @param int &$line_id id line to add
* @param int $line_id id line to add
* @param int $client_id id invoice customer
* @param string $client_nom name of cliente
* @param int $amount amount of invoice

4
htdocs/contact/canvas/actions_contactcard_common.class.php
View File

@ -94,7 +94,7 @@ abstract class ActionsContactCardCommon
/**
* Load data control
*
* @param string &$action Type of action
* @param string $action Type of action
* @param int $id Id of object
* @return void
*/
@ -228,7 +228,7 @@ abstract class ActionsContactCardCommon
/**
* Set content of ->tpl array, to use into template
*
* @param string &$action Type of action
* @param string $action Type of action
* @param int $id Id
* @return string HTML output
*/

2
htdocs/contact/canvas/default/actions_contactcard_default.class.php
View File

@ -75,7 +75,7 @@ class ActionsContactCardDefault extends ActionsContactCardCommon
/**
* Assign custom values for canvas
*
* @param string &$action Type of action
* @param string $action Type of action
* @param int $id Id
* @return void
*/

2
htdocs/core/actions_sendmails.inc.php
View File

@ -229,5 +229,3 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
}
}
?>

2
htdocs/core/actions_setnotes.inc.php
View File

@ -43,5 +43,3 @@ else if ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('
$result=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES),'_private');
if ($result < 0) setEventMessage($object->error,'errors');
}
?>

4
htdocs/core/class/canvas.class.php
View File

@ -125,7 +125,7 @@ class Canvas
/**
* Shared method for canvas to assign values for templates
*
* @param string &$action Action string
* @param string $action Action string
* @param int $id Object id (if ref not provided)
* @param string $ref Object ref (if id not provided)
* @return void
@ -181,7 +181,7 @@ class Canvas
/**
* Shared method for canvas to execute actions
*
* @param string &$action Action string
* @param string $action Action string
* @param int $id Object id
* @return mixed Return return code of doActions of canvas
* @deprecated This function is called if you add a doActions class inside your canvas. Try to not

1
htdocs/core/class/dolprintipp.class.php
View File

@ -201,4 +201,3 @@ class dolprintIPP
return $ipp->printer_attributes;
}
}
?>

2
htdocs/core/class/extrafields.class.php
View File

@ -1041,7 +1041,7 @@ class ExtraFields
* Fill array_options property of object by extrafields value (using for data sent by forms)
*
* @param array $extralabels $array of extrafields
* @param object &$object Object
* @param object $object Object
* @param string $onlykey Only following key is filled
* @return int 1 if array_options set / 0 if no value
*/

4
htdocs/core/class/hookmanager.class.php
View File

@ -114,8 +114,8 @@ class HookManager
*
* @param string $method Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
* @param array $parameters Array of parameters
* @param Object &$object Object to use hooks on
* @param string &$action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
* @param Object $object Object to use hooks on
* @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
* @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO.
* For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints.
* Can also return some values into an array ->results.

8
htdocs/core/class/html.form.class.php
View File

@ -1492,9 +1492,9 @@ class Form
/**
* constructProductListOption
*
* @param resultset &$objp Resultset of fetch
* @param string &$opt Option
* @param string &$optJson Option
* @param resultset $objp Resultset of fetch
* @param string $opt Option
* @param string $optJson Option
* @param int $price_level Price level
* @param string $selected Preselected value
* @return void
@ -4080,7 +4080,7 @@ class Form
/**
* Return HTML code to output a barcode
*
* @param Object &$object Object containing data to retrieve file name
* @param Object $object Object containing data to retrieve file name
* @param int $width Width of photo
* @return string HTML code to output barcode
*/

2
htdocs/core/class/html.formother.class.php
View File

@ -462,7 +462,7 @@ class FormOther
/**
* Write lines of a project (all lines of a project if parent = 0)
*
* @param int &$inc Cursor counter
* @param int $inc Cursor counter
* @param int $parent Id of parent task we want to see
* @param array $lines Array of task lines
* @param int $level Level

16
htdocs/core/class/ldap.class.php
View File

@ -370,7 +370,7 @@ class Ldap
* Ldap object connect and bind must have been done
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @param User $user Objet user that create
* @return int <0 if KO, >0 if OK
*/
@ -423,7 +423,7 @@ class Ldap
* Ldap object connect and bind must have been done
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @param string $user Objet user that modify
* @return int <0 if KO, >0 if OK
*/
@ -475,7 +475,7 @@ class Ldap
* Ldap object connect and bind must have been done
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @param User $user Objet user that update
* @param string $olddn Old DN entry key (before update)
* @return int <0 if KO, >0 if OK
@ -563,7 +563,7 @@ class Ldap
* Build a LDAP message
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @return string Content of file
*/
function dump_content($dn, $info)
@ -605,7 +605,7 @@ class Ldap
* Dump a LDAP message to ldapinput.in file
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @return int <0 if KO, >0 if OK
*/
function dump($dn, $info)
@ -642,7 +642,7 @@ class Ldap
* Ldap object connect and bind must have been done
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @param User $user Objet user that create
* @return int <0 if KO, >0 if OK
*/
@ -694,7 +694,7 @@ class Ldap
* Ldap object connect and bind must have been done
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @param User $user Objet user that create
* @return int <0 if KO, >0 if OK
*/
@ -746,7 +746,7 @@ class Ldap
* Ldap object connect and bind must have been done
*
* @param string $dn DN entry key
* @param string[] $info Attributes array
* @param array $info Attributes array
* @param User $user Objet user that create
* @return int <0 if KO, >0 if OK
*/

2
htdocs/core/class/link.class.php
View File

@ -234,7 +234,7 @@ class Link extends CommonObject
/**
* Loads all links from database
*
* @param array &$links array of Link objects to fill
* @param array $links array of Link objects to fill
* @param string $objecttype type of the associated object in dolibarr
* @param int $objectid id of the associated object in dolibarr
* @param string $sortfield field used to sort

6
htdocs/core/class/menubase.class.php
View File

@ -380,7 +380,7 @@ class Menubase
* @param string $myleftmenu Value for leftmenu to filter menu to load (always '')
* @param int $type_user 0=Menu for backoffice, 1=Menu for front office
* @param string $menu_handler Filter on name of menu_handler used (auguria, eldy...)
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @return array Return array with menu entries for top menu
*/
function menuTopCharger($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
@ -408,7 +408,7 @@ class Menubase
* @param string $myleftmenu Value for leftmenu to filter menu to load (always '')
* @param int $type_user 0=Menu for backoffice, 1=Menu for front office
* @param string $menu_handler Filter on name of menu_handler used (auguria, eldy...)
* @param array &$tabMenu Array with menu entries already loaded
* @param array $tabMenu Array with menu entries already loaded
* @return Menu Menu array for particular mainmenu value or full tabArray
*/
function menuLeftCharger($newmenu, $mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)
@ -493,7 +493,7 @@ class Menubase
* @param string $myleftmenu Value for left that defined leftmenu
* @param int $type_user Looks for menu entry for 0=Internal users, 1=External users
* @param string $menu_handler Name of menu_handler used ('auguria', 'eldy'...)
* @param array &$tabMenu Array to store new entries found (in most cases, it's empty, but may be alreay filled)
* @param array $tabMenu Array to store new entries found (in most cases, it's empty, but may be alreay filled)
* @return int >0 if OK, <0 if KO
*/
function menuLoad($mymainmenu, $myleftmenu, $type_user, $menu_handler, &$tabMenu)

8
htdocs/core/class/rssparser.class.php
View File

@ -258,7 +258,7 @@ class RssParser
if (!is_resource($xmlparser)) {
$this->error="ErrorFailedToCreateParser"; return -1;
}
xml_set_object($xmlparser, $this);
xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
xml_set_character_data_handler($xmlparser, 'feed_cdata');
@ -268,7 +268,7 @@ class RssParser
//var_dump($rss->_format);exit;
}
}
// If $rss loaded
if ($rss)
{
@ -452,7 +452,7 @@ class RssParser
*
* @param string $p Start
* @param string $element Tag
* @param array &$attrs Attributes of tags
* @param array $attrs Attributes of tags
* @return void
*/
function feed_start_element($p, $element, &$attrs)
@ -644,7 +644,7 @@ class RssParser
/**
* To concat 2 string with no warning if an operand is not defined
*
* @param string &$str1 Str1
* @param string $str1 Str1
* @param string $str2 Str2
* @return string String cancatenated
*/

4
htdocs/core/db/DoliDB.class.php
View File

@ -17,8 +17,8 @@
*/
/**
* \file htdocs/core/db/dolidb.class.php
* \brief Class file to manage Dolibarr database access
* \file htdocs/core/db/DoliDB.class.php
* \brief Class file to manage Dolibarr database access
*/
require_once DOL_DOCUMENT_ROOT .'/core/db/Database.interface.php';

22
htdocs/core/lib/admin.lib.php
View File

@ -853,17 +853,17 @@ function unActivateModule($value, $requiredby=1)
/**
* Add external modules to list of dictionaries
*
* @param array &$taborder Taborder
* @param array &$tabname Tabname
* @param array &$tablib Tablib
* @param array &$tabsql Tabsql
* @param array &$tabsqlsort Tabsqlsort
* @param array &$tabfield Tabfield
* @param array &$tabfieldvalue Tabfieldvalue
* @param array &$tabfieldinsert Tabfieldinsert
* @param array &$tabrowid Tabrowid
* @param array &$tabcond Tabcond
* @param array &$tabhelp Tabhelp
* @param array $taborder Taborder
* @param array $tabname Tabname
* @param array $tablib Tablib
* @param array $tabsql Tabsql
* @param array $tabsqlsort Tabsqlsort
* @param array $tabfield Tabfield
* @param array $tabfieldvalue Tabfieldvalue
* @param array $tabfieldinsert Tabfieldinsert
* @param array $tabrowid Tabrowid
* @param array $tabcond Tabcond
* @param array $tabhelp Tabhelp
* @return int 1
*/
function complete_dictionary_with_modules(&$taborder,&$tabname,&$tablib,&$tabsql,&$tabsqlsort,&$tabfield,&$tabfieldvalue,&$tabfieldinsert,&$tabrowid,&$tabcond,&$tabhelp)

4
htdocs/core/lib/files.lib.php
View File

@ -43,7 +43,7 @@ function dol_basename($pathfile)
* @param string $types Can be "directories", "files", or "all"
* @param int $recursive Determines whether subdirectories are searched
* @param string $filter Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
* @param string[] $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.'))
* @param array $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.'))
* @param string $sortcriteria Sort criteria ("","fullname","name","date","size")
* @param string $sortorder Sort order (SORT_ASC, SORT_DESC)
* @param int $mode 0=Return array minimum keys loaded (faster), 1=Force all keys like date and size to be loaded (slower), 2=Force load of date only, 3=Force load of size only
@ -1289,7 +1289,7 @@ function dol_uncompress($inputfile,$outputdir)
*
* @param string $dir Directory to scan
* @param string $regexfilter Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function
* @param string[] $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function
* @param array $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview\.png)$','^\.')). This regex value must be escaped for '/', since this char is used for preg_match function
* @param int $nohook Disable all hooks
* @return string Full path to most recent file
*/

8
htdocs/core/lib/functions.lib.php
View File

@ -3770,7 +3770,7 @@ function make_substitutions($chaine,$substitutionarray)
/**
* Complete the $substitutionarray with more entries
*
* @param array &$substitutionarray Array substitution old value => new value value
* @param array $substitutionarray Array substitution old value => new value value
* @param Translate $outputlangs If we want substitution from special constants, we provide a language
* @param Object $object If we want substitution from special constants, we provide data in a source object
* @param Mixed $parameters Add more parameters (useful to pass product lines)
@ -4109,7 +4109,7 @@ function dol_htmloutput_errors($mesgstring='', $mesgarray='', $keepembedded=0)
* or descending output and uses optionally natural case insensitive sorting (which
* can be optionally case sensitive as well).
*
* @param array &$array Array to sort (array of array('key','otherkey1','otherkey2'...))
* @param array $array Array to sort (array of array('key','otherkey1','otherkey2'...))
* @param string $index Key in array to use for sorting criteria
* @param int $order Sort order
* @param int $natsort 1=use "natural" sort (natsort), 0=use "standard" sort (asort)
@ -4330,8 +4330,8 @@ function picto_from_langcode($codelang)
* @param Conf $conf Object conf
* @param Translate $langs Object langs
* @param Object $object Object object
* @param array &$head Object head
* @param int &$h New position to fill
* @param array $head Object head
* @param int $h New position to fill
* @param string $type Value for object where objectvalue can be
* 'thirdparty' to add a tab in third party view
* 'intervention' to add a tab in intervention view

4
htdocs/core/lib/functions2.lib.php
View File

@ -1107,7 +1107,7 @@ function numero_semaine($time)
* Convertit une masse d'une unite vers une autre unite
*
* @param float $weight Masse a convertir
* @param int &$from_unit Unite originale en puissance de 10
* @param int $from_unit Unite originale en puissance de 10
* @param int $to_unit Nouvelle unite en puissance de 10
* @return float Masse convertie
*/
@ -1142,7 +1142,7 @@ function weight_convert($weight,&$from_unit,$to_unit)
*
* @param DoliDB $db Handler database
* @param Conf $conf Object conf
* @param User &$user Object user
* @param User $user Object user
* @param array $tab Tableau (cle=>valeur) des parametres a sauvegarder
* @return int <0 if KO, >0 if OK
*

1
htdocs/core/lib/holiday.lib.php
View File

@ -50,4 +50,3 @@ function holiday_prepare_head($object)
return $head;
}
?>

16
htdocs/core/lib/pdf.lib.php
View File

@ -420,7 +420,7 @@ function pdf_build_address($outputlangs,$sourcecompany,$targetcompany='',$target
/**
* Show header of page for PDF generation
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Translate $outputlangs Object lang for output
* @param int $page_height Height of page
* @return void
@ -441,7 +441,7 @@ function pdf_pagehead(&$pdf,$outputlangs,$page_height)
/**
* Add a draft watermark on PDF files
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Translate $outputlangs Object lang
* @param int $h Height of PDF
* @param int $w Width of PDF
@ -481,7 +481,7 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
/**
* Show bank informations for PDF generation
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Translate $outputlangs Object lang
* @param int $curx X
* @param int $cury Y
@ -643,7 +643,7 @@ function pdf_bank(&$pdf,$outputlangs,$curx,$cury,$account,$onlynumber=0,$default
/**
* Show footer of page for PDF generation
*
* @param PDF &$pdf The PDF factory
* @param PDF $pdf The PDF factory
* @param Translate $outputlangs Object lang for output
* @param string $paramfreetext Constant name of free text
* @param Societe $fromcompany Object company
@ -852,7 +852,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
/**
* Show linked objects for PDF generation
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param object $object Object
* @param Translate $outputlangs Object lang
* @param int $posx X
@ -890,7 +890,7 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al
/**
* Output line description into PDF
*
* @param PDF &$pdf PDF object
* @param PDF $pdf PDF object
* @param Object $object Object
* @param int $i Current line number
* @param Translate $outputlangs Object lang for output
@ -1587,13 +1587,13 @@ function pdf_getLinkedObjects($object,$outputlangs)
{
$outputlangs->load('orders');
$outputlangs->load('sendings');
$num=count($objects);
for ($i=0;$i<$num;$i++)
{
$objects[$i]->fetchObjectLinked();
$order = $objects[$i]->linkedObjects['commande'][0];
$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder") . ' / ' . $outputlangs->transnoentities("RefSending");
$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($order->ref) . ($order->ref_client ? ' ('.$order->ref_client.')' : '');
$linkedobjects[$objecttype]['ref_value'].= ' / ' . $outputlangs->transnoentities($objects[$i]->ref);

2
htdocs/core/lib/product.lib.php
View File

@ -357,5 +357,3 @@ function measuring_units_string($unit,$measuring_style='')
return $measuring_units[$unit];
}
?>

22
htdocs/core/lib/project.lib.php
View File

@ -206,13 +206,13 @@ function project_admin_prepare_head()
/**
* Show task lines with a particular parent
*
* @param string &$inc Counter that count number of lines legitimate to show (for return)
* @param string $inc Counter that count number of lines legitimate to show (for return)
* @param int $parent Id of parent task to start
* @param array &$lines Array of all tasks
* @param int &$level Level of task
* @param array $lines Array of all tasks
* @param int $level Level of task
* @param string $var Color
* @param int $showproject Show project columns
* @param int &$taskrole Array of roles of user for each tasks
* @param int $taskrole Array of roles of user for each tasks
* @param int $projectsListId List of id of project allowed to user (string separated with comma)
* @param int $addordertick Add a tick to move task
* @return void
@ -443,12 +443,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
/**
* Output a task line
*
* @param string &$inc ?
* @param string $inc ?
* @param string $parent ?
* @param Object $lines ?
* @param int &$level ?
* @param string &$projectsrole ?
* @param string &$tasksrole ?
* @param int $level ?
* @param string $projectsrole ?
* @param string $tasksrole ?
* @param string $mine Show only task lines I am assigned to
* @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to
* @return $inc
@ -589,10 +589,10 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
/**
* Search in task lines with a particular parent if there is a task for a particular user (in taskrole)
*
* @param string &$inc Counter that count number of lines legitimate to show (for return)
* @param string $inc Counter that count number of lines legitimate to show (for return)
* @param int $parent Id of parent task to start
* @param array &$lines Array of all tasks
* @param string &$taskrole Array of task filtered on a particular user
* @param array $lines Array of all tasks
* @param string $taskrole Array of task filtered on a particular user
* @return int 1 if there is
*/
function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)

2
htdocs/core/lib/treeview.lib.php
View File

@ -28,7 +28,7 @@
/**
* Show indent and picto of a tree line. Return array with information of line.
*
* @param array &$fulltree Array of entries in correct order
* @param array $fulltree Array of entries in correct order
* @param string $key Key of entry into fulltree to show picto
* @param int $silent Do not output indent and picto, returns only value
* @return array array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub)

4
htdocs/core/lib/trip.lib.php
View File

@ -54,10 +54,8 @@ function trip_prepare_head($object)
$head[$h][1] = $langs->trans("Info");
$head[$h][2] = 'info';
$h++;
complete_head_from_modules($conf,$langs,$object,$head,$h,'trip','remove');
return $head;
}
?>

1
htdocs/core/lib/usergroups.lib.php
View File

@ -342,4 +342,3 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '</table>';
}
?>

6
htdocs/core/lib/ws.lib.php
View File

@ -27,9 +27,9 @@
* Check authentication array and set error, errorcode, errorlabel
*
* @param array $authentication Array with authentication informations ('login'=>,'password'=>,'entity'=>,'dolibarrkey'=>)
* @param int &$error Number of errors
* @param string &$errorcode Error string code
* @param string &$errorlabel Error string label
* @param int $error Number of errors
* @param string $errorcode Error string code
* @param string $errorlabel Error string label
* @return User Return user object identified by login/pass/entity into authentication array
*/
function check_authentication($authentication,&$error,&$errorcode,&$errorlabel)

2
htdocs/core/login/functions_empty.php
View File

@ -39,5 +39,3 @@ function check_user_password_empty($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

3
htdocs/core/login/functions_forceuser.php
View File

@ -46,6 +46,3 @@ function check_user_password_forceuser($usertotest,$passwordtotest,$entitytotest
return $login;
}
?>

3
htdocs/core/login/functions_http.php
View File

@ -43,6 +43,3 @@ function check_user_password_http($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

2
htdocs/core/login/functions_ldap.php
View File

@ -227,5 +227,3 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

2
htdocs/core/login/functions_openid.php
View File

@ -112,5 +112,3 @@ function check_user_password_openid($usertotest,$passwordtotest,$entitytotest)
return $login;
}
?>

14
htdocs/core/menus/standard/auguria.lib.php
View File

@ -31,8 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
* @param DoliDB $db Database handler
* @param string $atarget Target
* @param int $type_user 0=Menu for backoffice, 1=Menu for front office
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param array &$menu Object Menu to return back list of menu entries
* @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param array $menu Object Menu to return back list of menu entries
* @param int $noout Disable output (Initialise &$menu only).
* @return int 0
*/
@ -203,8 +203,8 @@ function print_end_menu_array_auguria()
* @param DoliDB $db Database handler
* @param array $menu_array_before Table of menu entries to show before entries of menu handler
* @param array $menu_array_after Table of menu entries to show after entries of menu handler
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param Menu &$menu Object Menu to return back list of menu entries
* @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param Menu $menu Object Menu to return back list of menu entries
* @param int $noout Disable output (Initialise &$menu only).
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
* @param string $forceleftmenu 'all'=Force leftmenu to '' (= all)
@ -402,8 +402,8 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
* Function to test if an entry is enabled or not
*
* @param string $type_user 0=We need backoffice menu, 1=We need frontoffice menu
* @param array &$menuentry Array for menu entry
* @param array &$listofmodulesforexternal Array with list of modules allowed to external users
* @param array $menuentry Array for menu entry
* @param array $listofmodulesforexternal Array with list of modules allowed to external users
* @return int 0=Hide, 1=Show, 2=Show gray
*/
function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexternal)
@ -430,5 +430,3 @@ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexterna
if (! $menuentry['perms']) return 2; // No permissions and user is external
return 1;
}
?>

12
htdocs/core/menus/standard/eldy.lib.php
View File

@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
* @param DoliDB $db Database handler
* @param string $atarget Target (Example: '' or '_top')
* @param int $type_user 0=Menu for backoffice, 1=Menu for front office
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param array &$menu Object Menu to return back list of menu entries
* @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param array $menu Object Menu to return back list of menu entries
* @param int $noout Disable output (Initialise &$menu only).
* @return int 0
*/
@ -428,8 +428,8 @@ function print_end_menu_array()
* @param DoliDB $db Database handler
* @param array $menu_array_before Table of menu entries to show before entries of menu handler (menu->liste filled with menu->add)
* @param array $menu_array_after Table of menu entries to show after entries of menu handler (menu->liste filled with menu->add)
* @param array &$tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param Menu &$menu Object Menu to return back list of menu entries
* @param array $tabMenu If array with menu entries already loaded, we put this array here (in most cases, it's empty)
* @param Menu $menu Object Menu to return back list of menu entries
* @param int $noout Disable output (Initialise &$menu only).
* @param string $forcemainmenu 'x'=Force mainmenu to mainmenu='x'
* @param string $forceleftmenu 'all'=Force leftmenu to '' (= all)
@ -1364,8 +1364,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
* Function to test if an entry is enabled or not
*
* @param string $type_user 0=We need backoffice menu, 1=We need frontoffice menu
* @param array &$menuentry Array for menu entry
* @param array &$listofmodulesforexternal Array with list of modules allowed to external users
* @param array $menuentry Array for menu entry
* @param array $listofmodulesforexternal Array with list of modules allowed to external users
* @return int 0=Hide, 1=Show, 2=Show gray
*/
function dol_eldy_showmenu($type_user, &$menuentry, &$listofmodulesforexternal)

4
htdocs/core/modules/action/rapport.pdf.php
View File

@ -159,7 +159,7 @@ class CommActionRapport
/**
* Write content of pages
*
* @param PDF &$pdf Object pdf
* @param PDF $pdf Object pdf
* @param Translate $outputlangs Object langs
* @return int 1
*/
@ -255,7 +255,7 @@ class CommActionRapport
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Translate $outputlangs Object lang for output
* @param int $pagenb Page nb
* @return void

8
htdocs/core/modules/barcode/mod_barcode_product_standard.php
View File

@ -20,7 +20,7 @@
*/
/**
* \file htdocs/core/modules/product/mod_barcode_product_standard.php
* \file htdocs/core/modules/barcode/mod_barcode_product_standard.php
* \ingroup barcode
* \brief File of class to manage barcode numbering with standard rule
*/
@ -162,7 +162,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
* Check validity of code according to its rules
*
* @param DoliDB $db Database handler
* @param string &$code Code to check/correct
* @param string $code Code to check/correct
* @param Product $product Object product
* @param int $thirdparty_type 0 = customer/prospect , 1 = supplier
* @param string $type type of barcode (EAN, ISBN, ...)
@ -177,7 +177,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
global $conf;
//var_dump($code.' '.$product->ref.' '.$thirdparty_type);exit;
require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
$result=0;
@ -282,7 +282,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
{
$newcodefortest=substr($newcodefortest,0,12);
}
$result=check_value($mask,$newcodefortest);
return $result;

6
htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
View File

@ -177,7 +177,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
/**
* Generate Header
*
* @param PDF &$pdf Pdf object
* @param PDF $pdf Pdf object
* @param int $page Current page number
* @param int $pages Total number of pages
* @param Translate $outputlangs Object language for output
@ -283,7 +283,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
/**
* Output array
*
* @param PDF &$pdf PDF object
* @param PDF $pdf PDF object
* @param int $pagenb Page nb
* @param int $pages Pages
* @param Translate $outputlangs Object lang
@ -341,7 +341,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

12
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -533,7 +533,7 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Show payments table
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object order
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
@ -548,7 +548,7 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
@ -732,7 +732,7 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Show total to pay
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
@ -989,7 +989,7 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
@ -1084,7 +1084,7 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -1263,7 +1263,7 @@ class pdf_einstein extends ModelePDFCommandes
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

12
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
View File

@ -532,7 +532,7 @@ class pdf_proforma extends ModelePDFCommandes
/**
* Show payments table
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object order
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
@ -547,7 +547,7 @@ class pdf_proforma extends ModelePDFCommandes
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
@ -689,7 +689,7 @@ class pdf_proforma extends ModelePDFCommandes
/**
* Show total to pay
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
@ -946,7 +946,7 @@ class pdf_proforma extends ModelePDFCommandes
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
@ -1041,7 +1041,7 @@ class pdf_proforma extends ModelePDFCommandes
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -1220,7 +1220,7 @@ class pdf_proforma extends ModelePDFCommandes
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

6
htdocs/core/modules/contract/doc/pdf_strato.modules.php
View File

@ -357,7 +357,7 @@ class pdf_strato extends ModelePDFContract
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y
@ -423,7 +423,7 @@ class pdf_strato extends ModelePDFContract
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -602,7 +602,7 @@ class pdf_strato extends ModelePDFContract
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

8
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
View File

@ -73,7 +73,7 @@ class pdf_merou extends ModelePdfExpedition
/**
* Function to build pdf onto disk
*
* @param Object &$object Object expedition to generate (or id if old method)
* @param Object $object Object expedition to generate (or id if old method)
* @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int $hidedetails Do not show line details
@ -353,7 +353,7 @@ class pdf_merou extends ModelePdfExpedition
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y
@ -394,7 +394,7 @@ class pdf_merou extends ModelePdfExpedition
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text
@ -423,7 +423,7 @@ class pdf_merou extends ModelePdfExpedition
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output

8
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
View File

@ -76,7 +76,7 @@ class pdf_rouget extends ModelePdfExpedition
/**
* Function to build pdf onto disk
*
* @param Object &$object Object expedition to generate (or id if old method)
* @param Object $object Object expedition to generate (or id if old method)
* @param Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int $hidedetails Do not show line details
@ -354,7 +354,7 @@ class pdf_rouget extends ModelePdfExpedition
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y
@ -409,7 +409,7 @@ class pdf_rouget extends ModelePdfExpedition
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -649,7 +649,7 @@ class pdf_rouget extends ModelePdfExpedition
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

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

@ -535,7 +535,7 @@ class pdf_crabe extends ModelePDFFactures
/**
* Show payments table
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object invoice
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
@ -673,7 +673,7 @@ class pdf_crabe extends ModelePDFFactures
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
@ -829,7 +829,7 @@ class pdf_crabe extends ModelePDFFactures
/**
* Show total to pay
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
@ -1124,7 +1124,7 @@ class pdf_crabe extends ModelePDFFactures
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
@ -1218,7 +1218,7 @@ class pdf_crabe extends ModelePDFFactures
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -1449,7 +1449,7 @@ class pdf_crabe extends ModelePDFFactures
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

6
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
View File

@ -345,7 +345,7 @@ class pdf_soleil extends ModelePDFFicheinter
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y
@ -408,7 +408,7 @@ class pdf_soleil extends ModelePDFFicheinter
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -587,7 +587,7 @@ class pdf_soleil extends ModelePDFFicheinter
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

8
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
View File

@ -540,7 +540,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
@ -567,7 +567,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
@ -626,7 +626,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -842,7 +842,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

10
htdocs/core/modules/member/doc/pdf_standard.class.php
View File

@ -99,7 +99,7 @@ class pdf_standard
* Methode qui permet de modifier la taille des caracteres
* Cela modiera aussi l'espace entre chaque ligne
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param int $pt point
* @return void
*/
@ -118,7 +118,7 @@ class pdf_standard
* - %LOGO% is replace with company logo
* - %PHOTO% is replace with photo provided as parameter
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param string $textleft Text left
* @param string $header Header
* @param string $footer Footer
@ -300,7 +300,7 @@ class pdf_standard
/**
* Print dot line
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param int $x1 X1
* @param int $y1 Y1
* @param int $x2 X2
@ -341,7 +341,7 @@ class pdf_standard
/**
* Fonction realisant une croix aux 4 coins des cartes
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param int $x1 X1
* @param int $y1 Y1
* @param int $x2 X2
@ -412,7 +412,7 @@ class pdf_standard
/**
* Set format
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param string $format Format
* @return void
*/

2
htdocs/core/modules/modSalaries.class.php
View File

@ -22,7 +22,7 @@
*/
/**
* \defgroup tax Module salaries
* \defgroup salaries Module salaries
* \brief Module to include salaries management
* \file htdocs/core/modules/modSalaries.class.php
* \ingroup salaries

10
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
View File

@ -99,7 +99,7 @@ class pdf_standardlabel
* Methode qui permet de modifier la taille des caracteres
* Cela modiera aussi l'espace entre chaque ligne
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param int $pt point
* @return void
*/
@ -117,7 +117,7 @@ class pdf_standardlabel
* - %LOGO% is replace with company logo
* - %PHOTO% is replace with photo provided as parameter
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param string $textleft Text left
* @param string $header Header
* @param string $footer Footer
@ -292,7 +292,7 @@ class pdf_standardlabel
/**
* Print dot line
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param int $x1 X1
* @param int $y1 Y1
* @param int $x2 X2
@ -333,7 +333,7 @@ class pdf_standardlabel
/**
* Fonction realisant une croix aux 4 coins des cartes
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param int $x1 X1
* @param int $y1 Y1
* @param int $x2 X2
@ -404,7 +404,7 @@ class pdf_standardlabel
/**
* Set format
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param string $format Format
* @return void
*/

2
htdocs/core/modules/product/mod_codeproduct_elephant.php
View File

@ -220,7 +220,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
* Check validity of code according to its rules
*
* @param DoliDB $db Database handler
* @param string &$code Code to check/correct
* @param string $code Code to check/correct
* @param Product $product Object product
* @param int $type 0 = customer/prospect , 1 = supplier
* @return int 0 if OK

2
htdocs/core/modules/product/mod_codeproduct_leopard.php
View File

@ -91,7 +91,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
* Check validity of code according to its rules
*
* @param DoliDB $db Database handler
* @param string &$code Code to check/correct
* @param string $code Code to check/correct
* @param Product $product Object product
* @param int $type 0 = product , 1 = service
* @return int 0 if OK

6
htdocs/core/modules/project/pdf/pdf_baleine.modules.php
View File

@ -315,7 +315,7 @@ class pdf_baleine extends ModelePDFProjects
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y
@ -348,7 +348,7 @@ class pdf_baleine extends ModelePDFProjects
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -434,7 +434,7 @@ class pdf_baleine extends ModelePDFProjects
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

12
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -589,7 +589,7 @@ class pdf_azur extends ModelePDFPropales
/**
* Show payments table
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object proposal
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
@ -604,7 +604,7 @@ class pdf_azur extends ModelePDFPropales
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
@ -779,7 +779,7 @@ class pdf_azur extends ModelePDFPropales
/**
* Show total to pay
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
@ -1050,7 +1050,7 @@ class pdf_azur extends ModelePDFPropales
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
@ -1154,7 +1154,7 @@ class pdf_azur extends ModelePDFPropales
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -1354,7 +1354,7 @@ class pdf_azur extends ModelePDFPropales
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

1
htdocs/core/modules/propale/modules_propale.php
View File

@ -253,4 +253,3 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
}
}
?>

10
htdocs/core/modules/rapport/pdf_paiement.class.php
View File

@ -95,7 +95,7 @@ class pdf_paiement
$socid=0;
if ($user->societe_id) $socid=$user->societe_id;
if (! is_object($outputlangs)) $outputlangs=$langs;
// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
@ -141,7 +141,7 @@ class pdf_paiement
$sql.= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."facture as f,";
$sql.= " ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf,";
$sql.= " ".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir && ! $socid)
if (! $user->rights->societe->client->voir && ! $socid)
{
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
}
@ -149,7 +149,7 @@ class pdf_paiement
$sql.= " AND f.entity = ".$conf->entity;
$sql.= " AND p.fk_paiement = c.id ";
$sql.= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'";
if (! $user->rights->societe->client->voir && ! $socid)
if (! $user->rights->societe->client->voir && ! $socid)
{
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
}
@ -237,7 +237,7 @@ class pdf_paiement
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param int $page Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -296,7 +296,7 @@ class pdf_paiement
/**
* Output body
*
* @param PDF &$pdf PDF object
* @param PDF $pdf PDF object
* @param string $page Page
* @param array $lines Array of lines
* @param Translate $outputlangs Object langs

2
htdocs/core/modules/societe/mod_codeclient_elephant.php
View File

@ -239,7 +239,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
* Check validity of code according to its rules
*
* @param DoliDB $db Database handler
* @param string &$code Code to check/correct
* @param string $code Code to check/correct
* @param Societe $soc Object third party
* @param int $type 0 = customer/prospect , 1 = supplier
* @return int 0 if OK

2
htdocs/core/modules/societe/mod_codeclient_leopard.php
View File

@ -90,7 +90,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
* Check validity of code according to its rules
*
* @param DoliDB $db Database handler
* @param string &$code Code to check/correct
* @param string $code Code to check/correct
* @param Societe $soc Object third party
* @param int $type 0 = customer/prospect , 1 = supplier
* @return int 0 if OK

4
htdocs/core/modules/societe/mod_codeclient_monkey.php
View File

@ -139,7 +139,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
$date = dol_now();
$yymm = strftime("%y%m",$date);
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1);
@ -152,7 +152,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
* Check validity of code according to its rules
*
* @param DoliDB $db Database handler
* @param string &$code Code to check/correct
* @param string $code Code to check/correct
* @param Societe $soc Object third party
* @param int $type 0 = customer/prospect , 1 = supplier
* @return int 0 if OK

10
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -494,7 +494,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
/**
* Show total to pay
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
@ -689,7 +689,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
@ -785,7 +785,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
/**
* Show payments table
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object invoice
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
@ -870,7 +870,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -1045,7 +1045,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

12
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
View File

@ -521,7 +521,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
/**
* Show payments table
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object order
* @param int $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
@ -536,7 +536,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
@ -599,7 +599,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
/**
* Show total to pay
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
@ -802,7 +802,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
/**
* Show table for lines
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
@ -897,7 +897,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
/**
* Show top header of page.
*
* @param PDF &$pdf Object PDF
* @param PDF $pdf Object PDF
* @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
@ -1089,7 +1089,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
/**
* Show footer of page. Need this->emetteur object
*
* @param PDF &$pdf PDF
* @param PDF $pdf PDF
* @param Object $object Object to show
* @param Translate $outputlangs Object lang for output
* @param int $hidefreetext 1=Hide free text

2
htdocs/fichinter/document.php
View File

@ -131,7 +131,7 @@ else
print $langs->trans("ErrorUnknown");
}
llxFooter();
$db->close();
?>

2
htdocs/filefunc.inc.php
View File

@ -29,7 +29,7 @@
* \brief File that include conf.php file and commons lib like functions.lib.php
*/
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.0');
if (! defined('DOL_VERSION')) define('DOL_VERSION','3.6.1');
if (! defined('EURO')) define('EURO',chr(128));
// Define syslog constants

3
htdocs/holiday/define_holiday.php
View File

@ -190,7 +190,8 @@ print '</form>';
dol_fiche_end();
llxFooter();
$db->close();
?>

4
htdocs/imports/import.php
View File

@ -1762,8 +1762,8 @@ function show_elem($fieldssource,$pos,$key,$var,$nostyle='')
/**
* Return not used field number
*
* @param array &$fieldssource Array of field source
* @param array &$listofkey Array of keys
* @param array $fieldssource Array of field source
* @param array $listofkey Array of keys
* @return void
*/
function getnewkey(&$fieldssource,&$listofkey)

2
htdocs/langs/en_US/compta.lang
View File

@ -167,7 +167,7 @@ AccountancyDashboard=Accountancy summary
ByProductsAndServices=By products and services
RefExt=External ref
ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
LinkedOrder=linked to order
LinkedOrder=Link to order
ReCalculate=Recalculate
Mode1=Method 1
Mode2=Method 2

2
htdocs/livraison/class/livraison.class.php
View File

@ -968,5 +968,3 @@ class LivraisonLigne
}
}
?>

2
htdocs/main.inc.php
View File

@ -110,7 +110,7 @@ function test_sql_and_script_inject($val, $type)
/**
* Security: Return true if OK, false otherwise.
*
* @param string &$var Variable name
* @param string $var Variable name
* @param string $type 1=GET, 0=POST, 2=PHP_SELF
* @return boolean true if there is an injection
*/

23
htdocs/opensurvey/fonctions.php
View File

@ -25,14 +25,14 @@
/**
* Returns an array with the tabs for the "Opensurvey poll" section
* It loads tabs from modules looking for the entity Opensurveyso
*
*
* @param Opensurveysondage $object Current viewing poll
* @return array Tabs for the opensurvey section
*/
function opensurvey_prepare_head(Opensurveysondage $object) {
global $langs, $conf;
$h = 0;
$head = array();
@ -40,7 +40,7 @@ function opensurvey_prepare_head(Opensurveysondage $object) {
$head[0][1] = $langs->trans("Card");
$head[0][2] = 'general';
$h++;
$head[1][0] = 'results.php?id='.$object->id_sondage;
$head[1][1] = $langs->trans("SurveyResults");
$head[1][2] = 'preview';
@ -111,12 +111,12 @@ function showlogo()
$urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=companylogo&amp;file=thumbs/'.urlencode($mysoc->logo_small);
}
}
if (!$urllogo && (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png')))
{
$urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png';
}
print '<div style="text-align:center"><img alt="Logo" id="logosubscribe" title="" src="'.$urllogo.'"/></div>';
print '<br>';
}
@ -205,14 +205,14 @@ function dol_survey_random($car)
function ajouter_sondage()
{
global $db, $user;
require_once DOL_DOCUMENT_ROOT.'/opensurvey/class/opensurveysondage.class.php';
$sondage=dol_survey_random(16);
$allow_comments = empty($_SESSION['allow_comments']) ? 0 : 1;
$allow_spy = empty($_SESSION['allow_spy']) ? 0 : 1;
// Insert survey
$opensurveysondage = new Opensurveysondage($db);
$opensurveysondage->id_sondage = $sondage;
@ -226,9 +226,9 @@ function ajouter_sondage()
$opensurveysondage->allow_comments = $allow_comments;
$opensurveysondage->allow_spy = $allow_spy;
$opensurveysondage->sujet = $_SESSION['toutchoix'];
$res = $opensurveysondage->create($user);
if ($res < 0) {
dol_print_error($db);
}
@ -243,11 +243,10 @@ function ajouter_sondage()
unset($_SESSION['toutchoix']);
unset($_SESSION['totalchoixjour']);
unset($_SESSION['champdatefin']);
$urlback=dol_buildpath('/opensurvey/card.php',1).'?id='.$sondage;
header("Location: ".$urlback);
exit();
}
?>

1
htdocs/opensurvey/results.php
View File

@ -1083,4 +1083,3 @@ print '<a name="bas"></a>'."\n";
llxFooterSurvey();
$db->close();
?>

Some files were not shown because too many files have changed in this diff Show More