Fix: Avoid conflict with other payment modules functions
New: EMail topics can be forced by external modules
This commit is contained in:
Laurent Destailleur
parent
17cdbd2ea6
commit
7f81e029ab
@ -10,7 +10,7 @@
|
||||
; only the root user with no password, stop server and catch
|
||||
; files user.MY* to put them in the Dolibarr build/exe/doliwamp/mysql directory.
|
||||
;
|
||||
; Version: $Id: doliwamp.iss,v 1.82 2011/07/13 21:09:30 eldy Exp $
|
||||
; Version: $Id$
|
||||
;----------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -18,12 +18,12 @@
|
||||
; ----- Change this -----
|
||||
AppName=DoliWamp
|
||||
; DoliWamp-x.x.x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
|
||||
AppVerName=DoliWamp-3.1.0-beta
|
||||
AppVerName=DoliWamp-3.1.0-alpha
|
||||
; DoliWamp-x.x x or DoliWamp-x.x.x-dev or DoliWamp-x.x.x-beta
|
||||
OutputBaseFilename=DoliWamp-3.1.0-beta
|
||||
OutputBaseFilename=DoliWamp-3.1.0-alpha
|
||||
; Define full path from wich all relative path are defined
|
||||
; You must modify this to put here your dolibarr root directory
|
||||
SourceDir=C:\Mes Developpements\dolibarr
|
||||
SourceDir=C:\Work\Data\Workspace\dolibarr
|
||||
; ----- End of change
|
||||
;OutputManifestFile=build\doliwampbuild.log
|
||||
AppId=doliwamp
|
||||
@ -101,10 +101,10 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
|
||||
; PhpMyAdmin, Apache, Php, Mysql
|
||||
; Put here path of Wampserver applications
|
||||
; Value OK: apache 2.2.6, php 5.2.5 (5.2.11 fails if php_exif is on), mysql 5.0.45 or 5.1.36
|
||||
Source: "C:\Program Files\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
|
||||
Source: "C:\Work\Applis\Wamp\apps\phpmyadmin3.2.0.1\*.*"; DestDir: "{app}\apps\phpmyadmin3.2.0.1"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Work\Applis\Wamp\bin\apache\apache2.2.6\*.*"; DestDir: "{app}\bin\apache\apache2.2.6"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Work\Applis\Wamp\bin\php\php5.2.5\*.*"; DestDir: "{app}\bin\php\php5.2.5"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
|
||||
Source: "C:\Work\Applis\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
|
||||
; Mysql data files (does not overwrite if exists)
|
||||
Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".cvsignore,.project,CVS\*,Thumbs.db"
|
||||
; Dolibarr
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
* \ingroup core
|
||||
* \brief Fichier de la classe de stockage de la config courante
|
||||
* \remarks La config est stockee dans le fichier conf/conf.php
|
||||
* \version $Id: conf.class.php,v 1.61 2011/07/13 18:04:25 eldy Exp $
|
||||
* \version $Id: conf.class.php,v 1.60 2011/07/09 05:28:42 hregis Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -145,13 +145,13 @@ class Conf
|
||||
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_TRIGGERS$/i',$key,$reg))
|
||||
{
|
||||
$modulename = strtolower($reg[1]);
|
||||
$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/'; // TODO Replace inc by includes to have same path than standard
|
||||
$this->triggers_modules[] = '/'.$modulename.'/inc/triggers/';
|
||||
}
|
||||
// If this is constant for login method activated by a module
|
||||
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_LOGIN_METHOD$/i',$key,$reg))
|
||||
{
|
||||
$modulename = strtolower($reg[1]);
|
||||
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/'; // TODO Replace inc by includes to have same path than standard
|
||||
$this->login_method_modules[] = DOL_DOCUMENT_ROOT.'/'.$modulename.'/inc/login/';
|
||||
}
|
||||
// If this is constant for hook activated by a module. Value is list of hooked tabs separated with :
|
||||
elseif (preg_match('/^MAIN_MODULE_([A-Z_]+)_HOOKS$/i',$key,$reg))
|
||||
|
||||
@ -28,10 +28,10 @@
|
||||
* \file htdocs/filefunc.inc.php
|
||||
* \ingroup core
|
||||
* \brief File that include conf.php file and functions.lib.php
|
||||
* \version $Id: filefunc.inc.php,v 1.18 2011/07/13 21:19:58 eldy Exp $
|
||||
* \version $Id: filefunc.inc.php,v 1.17 2011/06/28 12:25:43 hregis Exp $
|
||||
*/
|
||||
|
||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
define('DOL_VERSION','3.1.0-alpha'); // Also defined in htdocs/install/inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
define('EURO',chr(128));
|
||||
|
||||
// Definition des constantes syslog
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* \file htdocs/includes/triggers/interface_modAgenda_ActionsAuto.class.php
|
||||
* \ingroup agenda
|
||||
* \brief Trigger file for agenda module
|
||||
* \version $Id: interface_modAgenda_ActionsAuto.class.php,v 1.34 2011/07/13 18:05:27 eldy Exp $
|
||||
* \version $Id: interface_modAgenda_ActionsAuto.class.php,v 1.33 2011/07/07 09:18:27 simnandez Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -550,14 +550,8 @@ class InterfaceActionsAuto
|
||||
{
|
||||
$now=dol_now();
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
|
||||
require_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php');
|
||||
$contactforaction=new Contact($this->db);
|
||||
$societeforaction=new Societe($this->db);
|
||||
if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
|
||||
if ($object->socid > 0) $societeforaction->fetch($object->socid);
|
||||
|
||||
// Insertion action
|
||||
require_once(DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php');
|
||||
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
|
||||
$actioncomm = new ActionComm($this->db);
|
||||
$actioncomm->type_code = $object->actiontypecode;
|
||||
@ -568,8 +562,8 @@ class InterfaceActionsAuto
|
||||
$actioncomm->durationp = 0;
|
||||
$actioncomm->punctual = 1;
|
||||
$actioncomm->percentage = -1; // Not applicable
|
||||
$actioncomm->contact = $contactforaction;
|
||||
$actioncomm->societe = $societeforaction;
|
||||
$actioncomm->contact = new Contact($this->db,$object->sendtoid);
|
||||
$actioncomm->societe = new Societe($this->db,$object->socid);
|
||||
$actioncomm->author = $user; // User saving action
|
||||
//$actioncomm->usertodo = $user; // User affected to action
|
||||
$actioncomm->userdone = $user; // User doing action
|
||||
|
||||
@ -22,10 +22,10 @@
|
||||
/** \file htdocs/install/inc.php
|
||||
* \ingroup core
|
||||
* \brief File that define environment for install pages
|
||||
* \version $Id: inc.php,v 1.135 2011/07/13 21:19:58 eldy Exp $
|
||||
* \version $Id: inc.php,v 1.134 2011/07/11 10:53:37 eldy Exp $
|
||||
*/
|
||||
|
||||
define('DOL_VERSION','3.1.0-beta'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
define('DOL_VERSION','3.1.0-alpha'); // Also defined in htdocs/master.inc.php (Ex: x.y.z-alpha, x.y.z)
|
||||
|
||||
require_once('../core/class/translate.class.php');
|
||||
require_once('../lib/functions.lib.php');
|
||||
|
||||
@ -42,7 +42,7 @@ ErrCatAlreadyExists=Ce nom est déjà utilisé
|
||||
AddProductToCat=Ajouter ce produit à une catégorie ?
|
||||
ImpossibleAddCat=Impossible d'ajouter la catégorie
|
||||
ImpossibleAssociateCategory=Impossible d'associer la catégorie
|
||||
WasAddedSuccessfully=<b>%s</b> a été ajouté avec succès.
|
||||
WasAddedSuccessfully=<b>%s</b> a été ajoutée avec succès.
|
||||
ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
|
||||
CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
|
||||
ProductIsInCategories=Ce produit/service est dans les catégories suivantes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user