diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope deleted file mode 100644 index bbb8e68be8f..00000000000 --- a/.settings/.jsdtscope +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index fcd0ec3ff64..00000000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Sun Oct 03 22:45:56 CEST 2010 -eclipse.preferences.version=1 -encoding//build/exe/doliwamp/Languages=ISO-8859-1 -encoding//htdocs/langs/fr_FR/other.lang=UTF-8 -encoding/=UTF-8 diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 3f05f297112..00000000000 --- a/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri May 08 23:29:39 CEST 2009 -eclipse.preferences.version=1 -line.separator=\n diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index 61a1a86c37e..00000000000 --- a/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Jul 17 02:14:29 CEST 2008 -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs deleted file mode 100644 index a17f9c6f764..00000000000 --- a/.settings/org.eclipse.php.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Sun Feb 20 12:18:58 CET 2011 -eclipse.preferences.version=1 -include_path= -org.eclipse.php.core.taskCaseSensitive=enabled -org.eclipse.php.core.taskPriorities=NORMAL,HIGH,NORMAL -org.eclipse.php.core.taskTags=TODO,FIXME,@todo diff --git a/.settings/org.eclipse.php.core.projectOptions.prefs b/.settings/org.eclipse.php.core.projectOptions.prefs deleted file mode 100644 index 277f4b8ffa9..00000000000 --- a/.settings/org.eclipse.php.core.projectOptions.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Wed Aug 13 10:35:38 CEST 2008 -eclipse.preferences.version=1 -org.eclipse.php.core.contextRoot= -org.eclipse.php.core.defaultEncoding= -org.eclipse.php.core.includePath=\n\n\n diff --git a/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs b/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs deleted file mode 100644 index ae74866c71c..00000000000 --- a/.settings/org.eclipse.php.debug.core.Debug_Process_Preferences.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Wed Oct 20 18:46:50 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.php.debug.core.use-project-settings=true -org.eclipse.php.debug.coredefaultPHP=PHP Linux 5.3.2 -org.eclipse.php.debug.coreoutput_encoding=UTF-8 -org.eclipse.php.debug.corephp_debugger_id=org.eclipse.php.debug.core.xdebugDebugger -org.eclipse.php.debug.corestop_at_first_line_string=true -org.eclipse.php.debug.coretransfer_encoding=UTF-8 diff --git a/.settings/org.eclipse.stp.policy.wtp.editor.prefs b/.settings/org.eclipse.stp.policy.wtp.editor.prefs deleted file mode 100644 index f03ca7036e1..00000000000 --- a/.settings/org.eclipse.stp.policy.wtp.editor.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Fri May 28 19:41:14 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.stp.policy.wtp.editor.overrides.global=false -org.eclipse.stp.policy.wtp.editor.schema.path=schemas diff --git a/.settings/org.eclipse.wst.html.core.prefs b/.settings/org.eclipse.wst.html.core.prefs deleted file mode 100644 index bb46a503139..00000000000 --- a/.settings/org.eclipse.wst.html.core.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Thu Jun 24 20:11:26 CEST 2010 -attrDuplicate=2 -attrInvalidName=2 -attrInvalidValue=2 -attrNameMismatch=2 -attrUndefName=2 -attrUndefValue=2 -attrValueMismatch=1 -attrValueUnclosed=2 -cdataInvalidContent=2 -cdataUnclosed=1 -commentInvalidContent=2 -commentUnclosed=1 -docDoctypeUnclosed=1 -docDuplicateTag=1 -docInvalidChar=2 -docInvalidContent=2 -eclipse.preferences.version=1 -elemCoexistence=2 -elemDuplicate=2 -elemEndInvalidCase=1 -elemInvalidContent=2 -elemInvalidDirective=1 -elemInvalidEmptyTag=2 -elemInvalidName=1 -elemMissingEnd=2 -elemMissingStart=1 -elemStartInvalidCase=2 -elemUnclosedEndTag=1 -elemUnclosedStartTag=1 -elemUnknownName=2 -elemUnnecessaryEnd=2 -piInvalidContent=2 -piUnclosed=1 -piUndefined=2 -refInvalidContent=2 diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803..00000000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2..00000000000 --- a/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 00d3fa93bb2..00000000000 --- a/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Sun Feb 20 12:20:29 CET 2011 -DELEGATES_PREFERENCE=delegateValidatorList -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator; -USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.104.v200911120201 -eclipse.preferences.version=1 -override=true -suspend=false -vals/org.eclipse.php.ui.HTMLValidatorForPHP/groups=0107include01111contentType130org.eclipse.php.core.phpsourceT0107exclude11504file111menu.js.phpF0104file114htdocs/custom2F0204file124htdocs/includes/efc_xfssF0204file125htdocs/includes/adodbtimeF0204file124htdocs/includes/artichowF0204file124htdocs/includes/ckeditorF0204file125htdocs/includes/fckeditorF0204file120htdocs/includes/fpdfF0204file125htdocs/includes/magpierssF0204file122htdocs/includes/nusoapF0204file122htdocs/includes/odtphpF0204file131htdocs/includes/php_excelreaderF0204file130htdocs/includes/php_writeexcelF0204file122htdocs/includes/smartyF0204file121htdocs/includes/tcpdfF02 -vals/org.eclipse.wst.html.ui.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude11004file114htdocs/custom2F0204file08dev/specF0204file134htdocs/cashdesk/include/jscalendarF0204file124htdocs/includes/ckeditorF0204file122htdocs/includes/jqueryF0204file123htdocs/includes/jsganttF0204file125htdocs/includes/fckeditorF0204file121htdocs/includes/tcpdfF0204file120htdocs/includes/fpdfF0204file121htdocs/includes/jcropF02 -vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude09113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file125htdocs/includes/fckeditorF0204file123htdocs/includes/jsganttF0204file09build/padF0204file117dev/phpcheckstyleF02 -vf.version=3 diff --git a/.settings/org.eclipse.wst.ws.service.policy.prefs b/.settings/org.eclipse.wst.ws.service.policy.prefs deleted file mode 100644 index 1c01941eb2d..00000000000 --- a/.settings/org.eclipse.wst.ws.service.policy.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri May 28 19:41:14 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.wst.ws.service.policy.projectEnabled=false diff --git a/.settings/org.eclipse.wst.xsl.core.prefs b/.settings/org.eclipse.wst.xsl.core.prefs deleted file mode 100644 index 02c732fd908..00000000000 --- a/.settings/org.eclipse.wst.xsl.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -#Tue Dec 22 11:07:44 CET 2009 -CHECK_CALL_TEMPLATES=2 -CHECK_XPATHS=2 -CIRCULAR_REF=2 -DUPLICATE_PARAMETER=2 -EMPTY_PARAM=1 -MISSING_INCLUDE=2 -MISSING_PARAM=1 -NAME_ATTRIBUTE_EMPTY=2 -NAME_ATTRIBUTE_MISSING=2 -TEMPLATE_CONFLICT=2 -eclipse.preferences.version=1 -use-project-settings=true diff --git a/.settings/org.sonar.ide.eclipse.prefs b/.settings/org.sonar.ide.eclipse.prefs deleted file mode 100644 index 99e5c726c17..00000000000 --- a/.settings/org.sonar.ide.eclipse.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Thu Jun 03 22:22:09 CEST 2010 -eclipse.preferences.version=1 -projectArtifactId=dolibarr -projectGroupId= -sonarServerUrl=http\://localhost\:9450 diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php index 6f7ceced553..e7794e1fce4 100644 --- a/htdocs/contact/canvas/actions_contactcard_common.class.php +++ b/htdocs/contact/canvas/actions_contactcard_common.class.php @@ -482,4 +482,4 @@ abstract class ActionsContactCardCommon } -?> \ No newline at end of file +?> diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 5e7d4321ca4..282832d471d 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -32,7 +32,7 @@ class Canvas var $db; var $error; var $errors=array(); - + var $actiontype; var $dirmodule; // Module directory @@ -53,7 +53,6 @@ class Canvas function __construct($DB, $actiontype='view') { $this->db = $DB; - $this->actiontype = $actiontype; if ($this->actiontype == 'add') $this->actiontype='create'; if ($this->actiontype == 'update') $this->actiontype='edit'; @@ -110,7 +109,6 @@ class Canvas //print ' => template_dir='.$this->template_dir.'
'; } - /** * Return if a canvas contains an action controller * diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 66097323008..42ea9fb8465 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1903,4 +1903,4 @@ else $db->close(); llxFooter(); -?> \ No newline at end of file +?> diff --git a/mysql/tables/llx_train.sql b/mysql/tables/llx_train.sql deleted file mode 100644 index 26ace81486e..00000000000 --- a/mysql/tables/llx_train.sql +++ /dev/null @@ -1,22 +0,0 @@ --- =================================================================== --- $Id$ --- $Source$ --- =================================================================== - - -create table llx_voyage -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - datec datetime, - datev date, -- date de valeur - dateo date, -- date operation - amount real NOT NULL default 0, - label varchar(255), - author varchar(50), - fk_type smallint, -- CB, Virement, cheque - fk_account integer, - num_releve varchar(50), - num_chq int, - rappro tinyint default 0, - note text -); diff --git a/test/phpunit/ModulesTest.php b/test/phpunit/ModulesTest.php index 33a8b978a0f..088c094a3bd 100755 --- a/test/phpunit/ModulesTest.php +++ b/test/phpunit/ModulesTest.php @@ -120,7 +120,7 @@ class ModulesTest extends PHPUnit_Framework_TestCase 'CashDesk','Categorie','ClickToDial','Commande','Comptabilite','Contrat','Deplacement','Document','Don', 'ECM','Expedition','Export','ExternalRss','ExternalSite','FTP','Facture', 'Fckeditor','Ficheinter','Fournisseur','GeoIPMaxmind','Gravatar','Import','Label','Ldap','Mailing', - 'Mantis','Notification','Paybox','Paypal','Prelevement','Product','Projet','Propale', + 'Notification','Paybox','Paypal','Prelevement','Product','Projet','Propale', 'Service','Societe','Stock','Syslog','Tax','User','WebServices'); foreach($modulelist as $modlabel) {