From c45bf06000c30440f5a1bbe964637b670fd0f163 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 21 Mar 2010 20:29:29 +0000
Subject: [PATCH] Works on ODT module.

---
 htdocs/includes/modules/modSociete.class.php |  4 ++++
 htdocs/lib/files.lib.php                     | 21 ++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php
index a688ab2f868..33f6cf8abcf 100644
--- a/htdocs/includes/modules/modSociete.class.php
+++ b/htdocs/includes/modules/modSociete.class.php
@@ -264,12 +264,16 @@ class modSociete extends DolibarrModules
 	 */
 	function init($options='')
 	{
+		require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
 
 		// Prevent pb of modules not correctly disabled
 		//$this->remove($options);
 
 		$sql = array();
 
+		create_exdir(DOL_DATA_ROOT.'/odttemplates/thirdparties');
+		dol_copy(DOL_DOCUMENT_ROOT.'/install/odttemplates/thirdparties/template_thirdparty.odt',DOL_DATA_ROOT.'/odttemplates/thirdparties/template_thirdparty.odt',0,0);
+
 		return $this->_init($sql,$options);
 	}
 
diff --git a/htdocs/lib/files.lib.php b/htdocs/lib/files.lib.php
index 8e100af6cc5..12cc2cba065 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/lib/files.lib.php
@@ -304,20 +304,25 @@ function dol_is_file($pathoffile)
 
 /**
  * Copy a file to another file
- * @param	$srcfile	Source file
- * @param	$destfile	Destination file
- * @param	$newmask	Mask for new file (0 by default means $conf->global->MAIN_UMASK)
- * @return	boolean		True if OK, false if KO
+ * @param	$srcfile			Source file
+ * @param	$destfile			Destination file
+ * @param	$newmask			Mask for new file (0 by default means $conf->global->MAIN_UMASK)
+ * @param 	$overwriteifexists	Overwrite file if exists (1 by default)
+ * @return	boolean				True if OK, false if KO
  */
-function dol_copy($srcfile, $destfile, $newmask=0)
+function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1)
 {
 	global $conf;
+	$result=false;
 
 	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask);
-	$result=@copy($srcfile, $destfile);
+	if ($overwriteifexists || ! dol_is_file($destfile))
+	{
+		$result=@copy($srcfile, $destfile);
 
-	if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
-	@chmod($file, octdec($newmask));
+		if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+		@chmod($file, octdec($newmask));
+	}
 
 	return $result;
 }