cvsimport
Conflicts: htdocs/install/mysql/migration/3.0.0-3.1.0.sql
This commit is contained in:
root
commit
661ef186e2
@ -23,7 +23,7 @@
|
||||
* \brief File of class to manage widget boxes
|
||||
* \author Rodolphe Qiedeville
|
||||
* \author Laurent Destailleur
|
||||
* \version $Id$
|
||||
* \version $Id: boxes.php,v 1.52 2011/06/28 15:05:44 hregis Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
/**
|
||||
* \file htdocs/compta/stats/comp.php
|
||||
* \ingroup commercial
|
||||
* \version $Id$
|
||||
* \version $Id: comp.php,v 1.43 2011/06/29 11:22:36 eldy Exp $
|
||||
* TODO Remove or add page in menus
|
||||
*/
|
||||
|
||||
@ -40,19 +40,16 @@ function propals ($db, $year, $month)
|
||||
{
|
||||
global $bc,$langs,$conf;
|
||||
|
||||
$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.price, p.ref, p.datep as dp, c.label as statut, c.id as statutid";
|
||||
$sql = "SELECT s.nom, s.rowid as socid, p.rowid as propalid, p.price, p.ref, p.datep as dp, p.fk_statut as statutid, c.label as statut";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
|
||||
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
|
||||
$sql.= ", ".MAIN_DB_PREFIX."c_propalst as c";
|
||||
$sql.= " WHERE p.fk_soc = s.rowid";
|
||||
$sql.= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
|
||||
$sql.= " AND p.entity = ".$conf->entity;
|
||||
$sql.= " AND p.fk_statut = c.id";
|
||||
$sql.= " AND c.id in (1,2,4)";
|
||||
$sql.= " AND p.fk_statut in (1,2,4)";
|
||||
$sql.= " AND date_format(p.datep, '%Y') = ".$year;
|
||||
$sql.= " AND round(date_format(p.datep, '%m')) = ".$month;
|
||||
|
||||
|
||||
$sql .= " ORDER BY p.fk_statut";
|
||||
$sql.= " ORDER BY p.fk_statut";
|
||||
|
||||
$result = $db->query($sql);
|
||||
$num = $db->num_rows($result);
|
||||
@ -77,7 +74,7 @@ function propals ($db, $year, $month)
|
||||
print "<tr class=\"liste_titre\">";
|
||||
print "<td>Societe</td>";
|
||||
print "<td>".$langs->trans("Ref")."</td>";
|
||||
print "<td align=\"right\">Date</td>";
|
||||
print "<td align=\"right\">".$langs->trans("Date")."</td>";
|
||||
print "<td align=\"right\">".$langs->trans("Price")."</td>";
|
||||
print "<td align=\"center\">".$langs->trans("Status")."</td>";
|
||||
print "</tr>\n";
|
||||
@ -353,5 +350,5 @@ if ($details == 1)
|
||||
$db->close();
|
||||
|
||||
|
||||
llxFooter('$Date$ - $Revision$');
|
||||
llxFooter('$Date: 2011/06/29 11:22:36 $ - $Revision: 1.43 $');
|
||||
?>
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* \file htdocs/core/class/html.form.class.php
|
||||
* \ingroup core
|
||||
* \brief File of class with all html predefined components
|
||||
* \version $Id$
|
||||
* \version $Id: html.form.class.php,v 1.183 2011/06/29 11:22:36 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -1814,7 +1814,7 @@ class Form
|
||||
{
|
||||
print '<option value="'.$obj->id.'">';
|
||||
}
|
||||
print $obj->label;
|
||||
print ($langs->trans("PropalStatus".$obj->code)!="PropalStatus".$obj->code)?$langs->trans("PropalStatus".$obj->code):$obj->label;
|
||||
print '</option>';
|
||||
$i++;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -24,7 +24,7 @@
|
||||
/**
|
||||
* \file htdocs/includes/modules/DolibarrModules.class.php
|
||||
* \brief Fichier de description et activation des modules Dolibarr
|
||||
* \version $Id$
|
||||
* \version $Id: DolibarrModules.class.php,v 1.159 2011/06/28 20:31:23 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -240,9 +240,9 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Retourne le nom traduit du module si la traduction existe dans admin.lang,
|
||||
* sinon le nom defini par defaut dans le module.
|
||||
* \return string Nom du module traduit
|
||||
* Retourne le nom traduit du module si la traduction existe dans admin.lang,
|
||||
* sinon le nom defini par defaut dans le module.
|
||||
* @return string Nom du module traduit
|
||||
*/
|
||||
function getName()
|
||||
{
|
||||
@ -263,9 +263,9 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Retourne la description traduite du module si la traduction existe dans admin.lang,
|
||||
* sinon la description definie par defaut dans le module.
|
||||
* \return string Nom du module traduit
|
||||
* Retourne la description traduite du module si la traduction existe dans admin.lang,
|
||||
* sinon la description definie par defaut dans le module.
|
||||
* @return string Nom du module traduit
|
||||
*/
|
||||
function getDesc()
|
||||
{
|
||||
@ -286,11 +286,11 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Retourne la version du module.
|
||||
* Pour les modules a l'etat 'experimental', retourne la traduction de 'experimental'
|
||||
* Pour les modules 'dolibarr', retourne la version de Dolibarr
|
||||
* Pour les autres modules, retourne la version du module
|
||||
* \return string Version du module
|
||||
* Retourne la version du module.
|
||||
* Pour les modules a l'etat 'experimental', retourne la traduction de 'experimental'
|
||||
* Pour les modules 'dolibarr', retourne la version de Dolibarr
|
||||
* Pour les autres modules, retourne la version du module
|
||||
* @return string Version du module
|
||||
*/
|
||||
function getVersion()
|
||||
{
|
||||
@ -359,9 +359,9 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Insert line in dolibarr_modules table.
|
||||
* \return int Nb of errors (0 if OK)
|
||||
* \remarks Storage is made for information only, table is not required for Dolibarr usage.
|
||||
* Insert line in dolibarr_modules table.
|
||||
* Storage is made for information only, table is not required for Dolibarr usage.
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function _dbactive()
|
||||
{
|
||||
@ -399,9 +399,9 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Remove line in dolibarr_modules table
|
||||
* \return int Nb of errors (0 if OK)
|
||||
* \remarks Storage is made for information only, table is not required for Dolibarr usage.
|
||||
* Remove line in dolibarr_modules table
|
||||
* Storage is made for information only, table is not required for Dolibarr usage.
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function _dbunactive()
|
||||
{
|
||||
@ -574,8 +574,8 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Insere les boites associees au module dans llx_boxes_def
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Insert boxes into llx_boxes_def
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function insert_boxes()
|
||||
{
|
||||
@ -630,8 +630,8 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Supprime les boites
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Delete boxes
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function delete_boxes()
|
||||
{
|
||||
@ -681,8 +681,8 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Desactive feuille de style du module par suppression ligne dans llx_const
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Desactive feuille de style du module par suppression ligne dans llx_const
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function delete_style_sheet()
|
||||
{
|
||||
@ -709,8 +709,8 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Remove links to new module page present in llx_const
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Remove links to new module page present in llx_const
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function delete_tabs()
|
||||
{
|
||||
@ -734,8 +734,8 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Active la feuille de style associee au module par insertion ligne dans llx_const
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Active la feuille de style associee au module par insertion ligne dans llx_const
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function insert_style_sheet()
|
||||
{
|
||||
@ -776,8 +776,8 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Add links of new pages from modules in llx_const
|
||||
* \return int Number of errors (0 if ok)
|
||||
* Add links of new pages from modules in llx_const
|
||||
* @return int Number of errors (0 if ok)
|
||||
*/
|
||||
function insert_tabs()
|
||||
{
|
||||
@ -925,9 +925,9 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Insert permissions definitions related to the module into llx_rights_def
|
||||
* \param $reinitadminperms If 1, we also grant them to admin user
|
||||
* \return int Number of error (0 if OK)
|
||||
* Insert permissions definitions related to the module into llx_rights_def
|
||||
* @param $reinitadminperms If 1, we also grant them to admin user
|
||||
* @return int Number of error (0 if OK)
|
||||
*/
|
||||
function insert_permissions($reinitadminperms=0)
|
||||
{
|
||||
@ -1026,8 +1026,8 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Supprime les permissions
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Delete permissions
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function delete_permissions()
|
||||
{
|
||||
@ -1148,8 +1148,8 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Remove menus entries
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Remove menus entries
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function delete_menus()
|
||||
{
|
||||
@ -1174,8 +1174,8 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Create directories required by module
|
||||
* \return int Number of errors (0 if OK)
|
||||
* Create directories required by module
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function create_dirs()
|
||||
{
|
||||
@ -1231,8 +1231,8 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Insert directories in llx_const
|
||||
* \return int Number of errors (0 if OK)
|
||||
* Insert directories in llx_const
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function insert_dirs($name,$dir)
|
||||
{
|
||||
@ -1272,8 +1272,8 @@ class DolibarrModules
|
||||
|
||||
|
||||
/**
|
||||
* \brief Remove directory entries
|
||||
* \return int Number of errors (0 if OK)
|
||||
* Remove directory entries
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function delete_dirs()
|
||||
{
|
||||
@ -1297,8 +1297,8 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Insert activation triggers from modules in llx_const
|
||||
* \return int Number of errors (0 if ok)
|
||||
* Insert activation triggers from modules in llx_const
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function insert_triggers()
|
||||
{
|
||||
@ -1337,8 +1337,8 @@ class DolibarrModules
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Remove activation triggers from modules in llx_const
|
||||
* \return int Nombre d'erreurs (0 si ok)
|
||||
* Remove activation triggers from modules in llx_const
|
||||
* @return int Nb of errors (0 if OK)
|
||||
*/
|
||||
function delete_triggers()
|
||||
{
|
||||
|
||||
@ -1,5 +1,9 @@
|
||||
--
|
||||
<<<<<<< HEAD
|
||||
-- $Id: 3.0.0-3.1.0.sql,v 1.75 2011/06/28 07:47:10 eldy Exp $
|
||||
=======
|
||||
-- $Id: 3.0.0-3.1.0.sql,v 1.77 2011/06/29 11:22:35 eldy Exp $
|
||||
>>>>>>> refs/heads/origin
|
||||
--
|
||||
-- Be carefull to requests order.
|
||||
-- This file must be loaded by calling /install/index.php page
|
||||
@ -421,7 +425,27 @@ ALTER TABLE llx_propal MODIFY ref_client varchar(50);
|
||||
ALTER TABLE llx_propal ADD COLUMN ref_int varchar(50) AFTER ref_ext;
|
||||
|
||||
-- Add module field to allow external modules to set their name when they add a new record during init/remove.
|
||||
<<<<<<< HEAD
|
||||
ALTER TABLE llx_c_type_contact ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_typent ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_effectif ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_forme_juridique ADD COLUMN module varchar(32) NULL;
|
||||
=======
|
||||
ALTER TABLE llx_c_chargesociales ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_civilite ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_effectif ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_forme_juridique ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_input_method ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_input_reason ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_paiement ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_paper_format ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_payment_term ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_prospectlevel ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_shipment_mode ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_type_contact ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_type_fees ADD COLUMN module varchar(32) NULL;
|
||||
ALTER TABLE llx_c_typent ADD COLUMN module varchar(32) NULL;
|
||||
|
||||
ALTER TABLE llx_user ADD signature text DEFAULT NULL AFTER email;
|
||||
|
||||
>>>>>>> refs/heads/origin
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_chargesociales.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_chargesociales
|
||||
@ -26,7 +26,8 @@ create table llx_c_chargesociales
|
||||
deductible smallint DEFAULT 0 NOT NULL,
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
code varchar(12) NOT NULL,
|
||||
fk_pays integer DEFAULT 1 NOT NULL
|
||||
fk_pays integer DEFAULT 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_civilite.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_civilite
|
||||
@ -24,6 +24,7 @@ create table llx_c_civilite
|
||||
rowid integer PRIMARY KEY,
|
||||
code varchar(6) UNIQUE NOT NULL,
|
||||
civilite varchar(50),
|
||||
active tinyint DEFAULT 1 NOT NULL
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_input_method.sql,v 1.2 2011/06/29 11:22:35 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_input_method
|
||||
@ -24,6 +24,7 @@ create table llx_c_input_method
|
||||
rowid integer AUTO_INCREMENT PRIMARY KEY,
|
||||
code varchar(30),
|
||||
libelle varchar(60),
|
||||
active tinyint default 1 NOT NULL
|
||||
active tinyint default 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_input_reason.sql,v 1.2 2011/06/29 11:22:36 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_input_reason
|
||||
@ -24,7 +24,7 @@ create table llx_c_input_reason
|
||||
rowid integer AUTO_INCREMENT PRIMARY KEY,
|
||||
code varchar(30),
|
||||
label varchar(60),
|
||||
active tinyint default 1 NOT NULL
|
||||
|
||||
active tinyint default 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_paiement.sql,v 1.4 2011/06/29 11:22:36 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
|
||||
@ -32,7 +32,8 @@ create table llx_c_paiement
|
||||
code varchar(6) UNIQUE NOT NULL,
|
||||
libelle varchar(30),
|
||||
type smallint,
|
||||
active tinyint DEFAULT 1 NOT NULL
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_paper_format.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_paper_format
|
||||
@ -25,8 +25,9 @@ create table llx_c_paper_format
|
||||
label varchar(50) NOT NULL,
|
||||
width float(6,2) DEFAULT 0, -- Largeur du papier
|
||||
height float(6,2) DEFAULT 0, -- Hauteur du papier
|
||||
unit varchar(5) NOT NULL, -- Unit<69> de mesure
|
||||
active tinyint DEFAULT 1 NOT NULL
|
||||
unit varchar(5) NOT NULL, -- Mesure unit
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
--
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_payment_term.sql,v 1.4 2011/06/29 11:22:35 eldy Exp $
|
||||
-- ============================================================================
|
||||
|
||||
create table llx_c_payment_term
|
||||
@ -28,5 +28,6 @@ create table llx_c_payment_term
|
||||
libelle_facture text,
|
||||
fdm tinyint, -- reglement fin de mois
|
||||
nbjour smallint,
|
||||
decalage smallint
|
||||
decalage smallint,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_prospectlevel.sql,v 1.3 2011/06/29 11:22:36 eldy Exp $
|
||||
-- ===================================================================
|
||||
|
||||
create table llx_c_prospectlevel
|
||||
@ -23,6 +23,7 @@ create table llx_c_prospectlevel
|
||||
code varchar(12) PRIMARY KEY,
|
||||
label varchar(30),
|
||||
sortorder smallint,
|
||||
active smallint DEFAULT 1 NOT NULL
|
||||
active smallint DEFAULT 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
) ENGINE=innodb;
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_shipment_mode.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $
|
||||
-- ===================================================================
|
||||
|
||||
create table llx_c_shipment_mode
|
||||
@ -25,5 +25,6 @@ create table llx_c_shipment_mode
|
||||
code varchar(30) NOT NULL,
|
||||
libelle varchar(50) NOT NULL,
|
||||
description text,
|
||||
active tinyint DEFAULT 0
|
||||
active tinyint DEFAULT 0,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_c_type_fees.sql,v 1.3 2011/06/29 11:22:35 eldy Exp $
|
||||
-- ========================================================================
|
||||
|
||||
create table llx_c_type_fees
|
||||
@ -24,5 +24,6 @@ create table llx_c_type_fees
|
||||
id integer AUTO_INCREMENT PRIMARY KEY,
|
||||
code varchar(12) UNIQUE NOT NULL,
|
||||
libelle varchar(30),
|
||||
active tinyint DEFAULT 1 NOT NULL
|
||||
active tinyint DEFAULT 1 NOT NULL,
|
||||
module varchar(32) NULL
|
||||
)ENGINE=innodb;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
-- ============================================================================
|
||||
-- Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||
-- Copyright (C) 2006-2009 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
-- Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
-- Copyright (C) 2007-2009 Regis Houssin <regis@dolibarr.fr>
|
||||
--
|
||||
-- This program is free software; you can redistribute it and/or modify
|
||||
@ -17,7 +17,7 @@
|
||||
-- along with this program; if not, write to the Free Software
|
||||
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
--
|
||||
-- $Id$
|
||||
-- $Id: llx_user.sql,v 1.8 2011/06/29 10:23:33 eldy Exp $
|
||||
-- ===========================================================================
|
||||
|
||||
create table llx_user
|
||||
@ -39,6 +39,7 @@ create table llx_user
|
||||
office_fax varchar(20),
|
||||
user_mobile varchar(20),
|
||||
email varchar(255),
|
||||
signature text DEFAULT NULL,
|
||||
admin smallint DEFAULT 0,
|
||||
webcal_login varchar(25), -- TODO move to an extra table (ex: llx_extra_fields)
|
||||
phenix_login varchar(25), -- TODO move to an extra table (ex: llx_extra_fields)
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
* \ingroup core
|
||||
* \brief File that defines environment for all Dolibarr process (pages or scripts)
|
||||
* This script reads the conf.php file, init $lang, $db and empty $user
|
||||
* \version $Id$
|
||||
* \version $Id: master.inc.php,v 1.349 2011/06/28 15:06:26 hregis Exp $
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
/**
|
||||
* \file htdocs/user/class/user.class.php
|
||||
* \brief Fichier de la classe utilisateur
|
||||
* \version $Id$
|
||||
* \version $Id: user.class.php,v 1.43 2011/06/29 10:23:32 eldy Exp $
|
||||
*/
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
|
||||
@ -53,6 +53,7 @@ class User extends CommonObject
|
||||
var $firstname;
|
||||
var $note;
|
||||
var $email;
|
||||
var $signature;
|
||||
var $office_phone;
|
||||
var $office_fax;
|
||||
var $user_mobile;
|
||||
@ -116,7 +117,7 @@ class User extends CommonObject
|
||||
}
|
||||
|
||||
/**
|
||||
* Charge un objet user avec toutes ces caracteristiques depuis un id ou login
|
||||
* Load a user from database with its id or ref (login)
|
||||
* @param id Si defini, id a utiliser pour recherche
|
||||
* @param login Si defini, login a utiliser pour recherche
|
||||
* @param sid Si defini, sid a utiliser pour recherche
|
||||
@ -127,11 +128,11 @@ class User extends CommonObject
|
||||
{
|
||||
global $conf;
|
||||
|
||||
// Nettoyage parametres
|
||||
// Clean parameters
|
||||
$login=trim($login);
|
||||
|
||||
// Recupere utilisateur
|
||||
$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.office_phone, u.office_fax, u.user_mobile,";
|
||||
// Get user
|
||||
$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.signature, u.office_phone, u.office_fax, u.user_mobile,";
|
||||
$sql.= " u.admin, u.login, u.webcal_login, u.phenix_login, u.phenix_pass, u.note,";
|
||||
$sql.= " u.pass, u.pass_crypted, u.pass_temp,";
|
||||
$sql.= " u.fk_societe, u.fk_socpeople, u.fk_member, u.ldap_sid,";
|
||||
@ -184,6 +185,7 @@ class User extends CommonObject
|
||||
$this->office_fax = $obj->office_fax;
|
||||
$this->user_mobile = $obj->user_mobile;
|
||||
$this->email = $obj->email;
|
||||
$this->signature = $obj->signature;
|
||||
$this->admin = $obj->admin;
|
||||
$this->note = $obj->note;
|
||||
$this->statut = $obj->statut;
|
||||
@ -1008,6 +1010,7 @@ class User extends CommonObject
|
||||
$this->office_fax = trim($this->office_fax);
|
||||
$this->user_mobile = trim($this->user_mobile);
|
||||
$this->email = trim($this->email);
|
||||
$this->signature = trim($this->signature);
|
||||
$this->note = trim($this->note);
|
||||
$this->openid = trim(empty($this->openid)?'':$this->openid); // Avoid warning
|
||||
$this->webcal_login = trim($this->webcal_login);
|
||||
@ -1038,6 +1041,7 @@ class User extends CommonObject
|
||||
$sql.= ", office_fax = '".$this->db->escape($this->office_fax)."'";
|
||||
$sql.= ", user_mobile = '".$this->db->escape($this->user_mobile)."'";
|
||||
$sql.= ", email = '".$this->db->escape($this->email)."'";
|
||||
$sql.= ", signature = '".addslashes($this->signature)."'";
|
||||
$sql.= ", webcal_login = '".$this->db->escape($this->webcal_login)."'";
|
||||
$sql.= ", phenix_login = '".$this->db->escape($this->phenix_login)."'";
|
||||
$sql.= ", phenix_pass = '".$this->db->escape($this->phenix_pass)."'";
|
||||
@ -1483,7 +1487,7 @@ class User extends CommonObject
|
||||
function SetInGroup($group, $entity, $notrigger=0)
|
||||
{
|
||||
global $conf, $langs, $user;
|
||||
|
||||
|
||||
$error=0;
|
||||
|
||||
$this->db->begin();
|
||||
@ -1510,7 +1514,7 @@ class User extends CommonObject
|
||||
if ($result < 0) { $error++; $this->errors=$interface->errors; }
|
||||
// Fin appel triggers
|
||||
}
|
||||
|
||||
|
||||
if (! $error)
|
||||
{
|
||||
$this->db->commit();
|
||||
@ -1540,7 +1544,7 @@ class User extends CommonObject
|
||||
function RemoveFromGroup($group, $entity, $notrigger=0)
|
||||
{
|
||||
global $conf,$langs,$user;
|
||||
|
||||
|
||||
$error=0;
|
||||
|
||||
$this->db->begin();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user