Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 19:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,329 Commits 36 Branches 190 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

136 Commits

Author SHA1 Message Date
Laurent Destailleur
8878c73732 Fix: link to other elements must be at end everywhere 2016-06-26 12:07:24 +02:00
Laurent Destailleur
d23a8a56ea Fix must use the constant, not hard coded value. 2016-06-25 21:40:45 +02:00
Laurent Destailleur
f021a8ca31 FIX Bad error management into trigger of mailmanspip 2016-06-25 18:48:50 +02:00
Laurent Destailleur
8187dc2006 Fix css 2016-06-19 16:07:34 +02:00
Laurent Destailleur
9019576394 Fix css class opacitymedium was not used everywhere. 2016-06-07 15:58:02 +02:00
Laurent Destailleur
9508de85af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-06-04 18:37:56 +02:00
Laurent Destailleur
c2e853db41 FIX A non admin user should not be able to set/unset a user as admin 
even if he has right to manage permission
 2016-06-04 18:37:41 +02:00
jean
918ba71e7f FIX #5014 
if $user is admin and different from $object then nbadmin >=1 is ok when
not in multicompany
 2016-06-04 14:59:43 +02:00
Laurent Destailleur
5b55af4d66 NEW Mutualize code: Use one call of function "addThumbs", when possible, 
to generate thumbs files instead of several call of "vignette" function.
 2016-04-09 14:12:21 +02:00
Laurent Destailleur
6096c8c49a Minor fix in CSS 2016-04-02 16:53:55 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d Revert "Corrected non-static usages of Form::multiselectarray function" 
This reverts commit 0a53cdd88f.
 2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f Corrected non-static usages of Form::multiselectarray function 2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
5eef373ed6 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/user/card.php
 2016-03-18 14:56:44 +01:00
Laurent Destailleur
2b1f57f01e Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/savedemo.sh
	htdocs/filefunc.inc.php
	htdocs/user/card.php
 2016-03-18 11:54:14 +01:00
Laurent Destailleur
5edeeae384 FIX Bad error and style message when changing its own login 2016-03-18 11:30:15 +01:00
Laurent Destailleur
e201357907 Merge pull request #4817 from aspangaro/3.9-p19 
Fix: 3.9 Problem of rowspan in edit mode on user card
 2016-03-18 00:02:19 +01:00
Laurent Destailleur
18804ee929 FIX Bad color of message password changed 2016-03-18 00:01:14 +01:00
Laurent Destailleur
75ed221fb8 Fix regression with last PR: change of password was not working. 2016-03-17 23:58:04 +01:00
Regis Houssin
a2bb57e33b Fix: use clone instead dol_clone 2016-03-17 15:22:05 +01:00
Regis Houssin
ae16d6c45c Fix: missing color update 2016-03-17 15:11:57 +01:00
Regis Houssin
d2d38f58bf Fix: beware with merges in conflict !! 2016-03-17 09:22:12 +01:00
aspangaro
4167663491 Fix: 3.9 Problem of rowspan in edit mode 2016-03-15 06:53:17 +01:00
Raphaël Doursenaud
5bb153877a [Qual] Replaced deprecated dol_clone calls 
With proper clone calls.
 2016-02-16 16:05:30 +01:00
Laurent Destailleur
8fb0f8d9d1 Merge branch 'patch-100' of https://github.com/defrance/dolibarr into 
defrance-patch-100

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/user/card.php
 2016-02-16 13:54:56 +01:00
BENKE Charlie
79b79e2acc Update card.php 2016-02-15 09:21:21 +01:00
BENKE Charlie
5e288db0e5 add categorie user based on contact user 
allow to add categorie to user, the same as contact user (because user and contact are persons too)
 2016-02-13 10:42:45 +01:00
aspangaro
9c20bf1b2e Updated: User accountancy code depends on Accounting module, not Salaries module 2016-02-13 08:03:49 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dadc24462a Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:14:39 +01:00
Laurent Destailleur
49a325e7ae Fix: We must ue the "small" size of imge to show on card pages. 2016-01-22 14:10:27 +01:00
Laurent Destailleur
45363cbf4c Save space on user card so groups are more visible 2016-01-21 16:10:20 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
philippe grand
c740a85006 [Qual] Uniformize code 2015-12-21 14:43:21 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
aspangaro
d12e3ca91f Finish work on better integration of skype 2015-11-28 14:43:16 +01:00
Laurent Destailleur
3f87b30327 Use same way to obfuscate key than password 2015-11-22 14:21:12 +01:00
Laurent Destailleur
97dc4c346b Merge pull request #4026 from aspangaro/develop-hrm 
New: FR #3699 HRM Add address informations in user card
 2015-11-21 00:27:29 +01:00
aspangaro
98d5f21787 Debug state 2015-11-19 06:21:37 +01:00
aspangaro
1e4d8ec104 New: HRM #3699 Add address informations in user card 2015-11-18 06:34:08 +01:00
aspangaro
c7df6c15a2 Different display if employee mode 2015-11-17 21:22:45 +01:00
Laurent Destailleur
59a79442b0 Enhance code for select field list feature. 
Add gender and employee on user list.
 2015-11-11 17:05:18 +01:00
Laurent Destailleur
13a0fa2c69 Missing css 2015-11-10 15:50:13 +01:00