Commit Graph

1400 Commits

Author SHA1 Message Date
Maxime Kohlhaas
7facbf7aa2 Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 18:12:29 +01:00
Maxime Kohlhaas
8ab450f69b Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 17:54:51 +01:00
Laurent Destailleur
a7d41d74e8 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 18:09:05 +01:00
Laurent Destailleur
5e42a9ff8a Fix: Revert again another fix that was not correct. It was no more
possible to edit a user even if user has permission for.
If module multicompany does not exists (standard mode), no
other test must be added to the if, except the $canxxx test.
2013-01-23 18:08:11 +01:00
Regis Houssin
beea9c2ec4 Fix: use the users entity 2013-01-23 15:44:51 +01:00
Regis Houssin
9203cce485 Fix: use the users entity 2013-01-23 15:41:17 +01:00
Regis Houssin
4a0bc90d5a Fix: only once superadmin and an admin can not delete/modify a
superadmin
2013-01-23 15:27:36 +01:00
Regis Houssin
459adb146c Fix: only once superadmin and an admin can not delete/modify a
superadmin
2013-01-23 15:26:18 +01:00
Regis Houssin
b12101a650 Fix: only once superadmin if no multicompany setup 2013-01-23 15:11:33 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/boxes/box_activity.php
2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
2b8aa54f68 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 10:32:49 +01:00
Laurent Destailleur
3685911bfa Merge pull request #616 from FHenry/3.3
Fix bug [ bug #694 ] Set security permision to user belong to group
2013-01-16 11:45:33 -08:00
fhenry
968e980f58 Fix bug [ bug #694 ] Set security permision to user belong to group 2013-01-16 18:58:39 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Laurent Destailleur
e28fefc989 Fix: Missinf class 2013-01-15 15:43:37 +01:00
Laurent Destailleur
8b77005eae Merge pull request #605 from FHenry/develop
remove dummy line
2013-01-13 11:59:14 -08:00
fhenry
b9c53fd796 remove dummy line 2013-01-13 20:50:54 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
2013-01-13 19:33:54 +01:00
fhenry
2cdeb95b67 Set member id on create not by sql request after.
Mandatory for trigger USER_CREATE to do action if user is member
2013-01-12 15:16:38 +01:00
Laurent Destailleur
14dede1a74 Fix: Protection to avoid renaming a user with a login that already
exists.
2013-01-10 21:32:10 +01:00
Laurent Destailleur
941afd7545 Fix: Because of autocomplete, password was changed when we changed
login.
2013-01-10 20:12:14 +01:00
Laurent Destailleur
0c7b469192 Fix: Session was lost when user change its own login. 2013-01-10 20:07:44 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
fhenry
0158885415 CheckStyle
I check everypalce where this function is call in Dolibarr, and to be
consistant it's better to use new attribute names
2013-01-03 23:57:18 +01:00
fhenry
3e05581c70 Same as last commit 2013-01-03 15:13:07 +01:00
fhenry
f2a4e42712 CheckStyle
I check everypalce where this function is call in Dolibarr, and to be
consistant it's better to use new attribute names
2013-01-03 14:44:04 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations
(a lot)
2013-01-02 18:43:59 +01:00
Laurent Destailleur
cd6e3464db Fix: Several fixes for bad management of external/internal users. 2013-01-02 14:35:16 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
ca2b3f11b1 Fix: Several fix in trigger names 2012-12-30 12:24:53 +01:00
Laurent Destailleur
fe469b83ab Fix: [ bug #641 ] Suppression d'un administrateur 2012-12-21 17:45:13 +01:00
Laurent Destailleur
7cf47b2e24 Fix: Missing translation 2012-12-17 15:47:01 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Laurent Destailleur
4413c0a5a7 Fix: upload user file 2012-12-12 11:57:56 +01:00
Laurent Destailleur
f4459ee1f1 Fix: Regression detected by PHPUnit 2012-12-10 19:06:59 +01:00
fhenry
ec09f79a2f comment 2012-12-08 19:23:13 +01:00
Laurent Destailleur
cd676b323d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 18:32:18 +01:00
Laurent Destailleur
58118bb366 Fix: error during include when multicompany module enabled. 2012-12-08 15:35:08 +01:00
Laurent Destailleur
afb45e1b31 Comment 2012-12-08 15:26:27 +01:00
fhenry
1d6bc23f4d - Uniformize Extrafield deletion for adherent,user,product,societe by
using commonobject method
 - Add convertion of tms timestamp special case in mysql for pgsql
2012-12-08 14:23:52 +01:00
Regis Houssin
3d4621327c Fix: EOL !! tant que ce problème sera présent, les risques de problèmes
de merge et de conflits sera présent !! il faut utiliser la dernière
version d'Eclipse et de Egit...
2012-12-05 11:18:45 +01:00
Laurent Destailleur
d428549e15 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-02 13:51:52 +01:00
Laurent Destailleur
938dc92ab6 Qual: More complete error management into delete methods 2012-12-02 13:51:33 +01:00
Regis Houssin
00aa22e1d7 Fix: wrong EOL 2012-12-02 11:03:23 +01:00
Laurent Destailleur
008f5fbcfc New: extrafields are available onto users cards. 2012-11-30 15:55:59 +01:00
Laurent Destailleur
124366f41a Fix: To be compatible with LDAP synchro, property oldcopy must be set.
We add a warning if not.
2012-11-11 23:31:45 +01:00