Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

1400 Commits

Author SHA1 Message Date
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
fb625f0ca7 FIX #4812 2016-03-18 13:58:06 +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
Laurent Destailleur
d4c6c4c140 NEW Holiday is a RH module. All RH module provides by default visilibity 
on users of its hierarchy.
 2016-03-14 21:22:49 +01:00
Laurent Destailleur
77e4fb1883 Fix style 2016-03-14 16:01:27 +01:00
Laurent Destailleur
619ebf9a3e Enhance css of search fields 2016-03-13 20:38:16 +01:00
Laurent Destailleur
87093c79f9 Merge pull request #4708 from marcosgdf/account-constants 
Started using Account TYPE and STATUS constants
 2016-03-04 16:23:50 +01:00
Laurent Destailleur
14ab10328c Minor fixes 2016-03-03 20:48:11 +01:00
Laurent Destailleur
974879ea9d NEW Disabled users are striked. 2016-03-03 20:20:04 +01:00
Marcos García de La Fuente
dcde7773a3 Started using Account TYPE and STATUS constants 2016-03-02 11:04:52 +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
BENKE Charlie
c910fd151f add setcategorie on user class 2016-02-13 10:27:12 +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
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
e28765ff69 Fix: List of employee is by default selected on employee = yes 2016-02-07 23:07:16 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
84f4f2d40f FIX The search on user/group was not using new code. Fiels used for 
search was not visible.
 2016-02-07 02:55:56 +01:00
Laurent Destailleur
7c96194750 NEW Hidden option MAIN_LANDING_PAGE to choose the first page to show 
after login works as a "global" option (llx_const) and as a "per user"
option (llx_user_param).
 2016-01-24 17:40:07 +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
50b0019ead A protection to avoid situation loosing all admin accounts 2016-01-22 11:54:14 +01:00
Laurent Destailleur
45363cbf4c Save space on user card so groups are more visible 2016-01-21 16:10:20 +01:00
aspangaro
87f1e55bcb Fix: SQL error on user bank tab 2016-01-10 07:08:49 +01:00
Laurent Destailleur
06c97b931b Fix css 2016-01-09 00:06:16 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
philippe grand
c740a85006 [Qual] Uniformize code 2015-12-21 14:43:21 +01:00
Laurent Destailleur
b179a193dd Fix param for username is $username and not $login 2015-12-21 03:01:37 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Raphaël Doursenaud
4f359616ce [Security] Hide click to dial password 2015-12-09 18:16:08 +01:00
Laurent Destailleur
745875d21e NEW Can choose fields to show on project list 2015-12-06 01:19:27 +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
497c30d994 NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:38:45 +01:00
Laurent Destailleur
9d3451b31d NEW Add thumb of users into thumbs stats on home page 2015-12-05 19:31:32 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
aspangaro
e1c8e6d8f6 Remove useless code 2015-12-01 20:27:29 +01:00