lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
51,726 Commits 43 Branches 150 Tags 886 MiB
c4d8c20abb
Commit Graph

51726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0279e99b0a Update warning for mysql 5.5.4* bug 2015-12-06 12:04:34 +01:00
AlainRnet
50cf96bd16 Update const.php 
link to help file
 2015-12-06 12:01:59 +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
3fb7a9429b No more need to install mysql 5.6 2015-12-05 23:55:10 +01:00
Laurent Destailleur
27c7e3cb7e Try to solve mysql pb with new travis 2015-12-05 23:45:08 +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
Laurent Destailleur
ff4f1e7a5b Debug 3.9 2015-12-05 19:20:39 +01:00
Laurent Destailleur
e002021d7d Fix td balance 2015-12-05 17:49:08 +01:00
BENKE Charlie
02f4c9879b Update card.php 2015-12-05 10:16:56 +01:00
yassine belkaid
8c22274300 Fixed assigning exceptional leave for a user 2015-12-05 00:41:00 +00:00
yassine belkaid
1075940e93 ignore conf/conf.php file 2015-12-05 00:37:32 +00:00
Laurent Destailleur
4a2bda3491 Look enhancement 2015-12-04 23:25:34 +01:00
philippe grand
f640486c8b [Qual] Uniformize code 2015-12-04 22:50:03 +01:00
Laurent Destailleur
5cd43d2df0 Some debug on new features 2015-12-04 20:51:34 +01:00
philippe grand
94fe00fe8d [Qual] Uniformize code 2015-12-04 19:45:39 +01:00
Laurent Destailleur
eb795a7a9d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-04 18:39:39 +01:00
Laurent Destailleur
c91aa0aa90 Merge pull request #4154 from GPCsolutions/dolibarr-md-icons 
Material Design icons
 2015-12-04 18:39:26 +01:00
Laurent Destailleur
8c03e46a83 Removed a TODO 2015-12-04 18:33:57 +01:00
Laurent Destailleur
02784c89f9 Merge pull request #4153 from FHenry/3.8 
FIX : Bug: $this is not accessible Mailing::libStatutDest #4050
 2015-12-04 18:30:43 +01:00
Laurent Destailleur
b169b976b7 Merge pull request #4152 from GPCsolutions/dolibarr-md 
Fixed md theme name
 2015-12-04 18:30:01 +01:00
Laurent Destailleur
d0d7e83929 Merge pull request #4149 from GPCsolutions/dolibarr-php7 
[Qual] OOP detection of PHP MySQL driver
 2015-12-04 18:25:14 +01:00
Laurent Destailleur
b3ed99ddc1 Merge pull request #4146 from fmarcet/3.6 
FIX: Not delete a product when have customer price
 2015-12-04 18:24:37 +01:00
Laurent Destailleur
6542da404e Merge pull request #4129 from aspangaro/develop-bank 
New HRM Add bank tab in user to pay salary or expense report
 2015-12-04 18:23:47 +01:00
Raphaël Doursenaud
87d6a5926b Fixed md theme name 2015-12-04 18:05:04 +01:00
Raphaël Doursenaud
a8f67808de NEW Used matching icons for Material Design theme 
Icons from https://www.google.com/design/icons/
Licenced under CC BY 4.0
 2015-12-04 18:04:41 +01:00
Raphaël Doursenaud
1dfd3f396e Fixed md theme name 2015-12-04 18:04:41 +01:00
Florian HENRY
955fad910d FIX : Bug: $this is not accessible in static context in 
Mailing::libStatutDest #4050
 2015-12-04 17:32:17 +01:00
Laurent Destailleur
bcadc33e31 Debug visibility on task/projects 2015-12-04 15:37:28 +01:00
BENKE Charlie
1da6b06605 Update 3.8.0-3.9.0.sql 2015-12-04 13:23:13 +01:00
aspangaro
6598ac6745 Add rights to see tab (hrm->employee->read) 2015-12-04 12:48:36 +01:00
aspangaro
c30728326e Merge remote-tracking branch 'Upstream/develop' into develop-bank 2015-12-04 12:41:51 +01:00
BENKE Charlie
46aaf9c270 Update 3.8.0-3.9.0.sql 2015-12-04 12:34:17 +01:00
Laurent Destailleur
e6ebc9c293 More complete tooltip help 2015-12-04 12:24:36 +01:00
Laurent Destailleur
00aa5aace7 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	dev/codesniffer/ruleset.xml
 2015-12-04 12:14:24 +01:00
Laurent Destailleur
a24cbf5585 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-04 12:12:23 +01:00
Laurent Destailleur
4dd1cb3e77 Theme MD looks ready for 3.9 now. 2015-12-04 12:12:12 +01:00
BENKE Charlie
7ea3df4d06 add date start and end of intervention 
add dateo (date open/start) and datee (date end) of intervention
this date are filled by the fichinterdet date and can be displayed on planning
 2015-12-04 11:28:28 +01:00
BENKE Charlie
f3ff8c5951 add dates of intervention 2015-12-04 11:25:07 +01:00
BENKE Charlie
bf9cb46aad update dateo and datee based on fichinterdet 
we update fields datee and dateo based on fichinterdet
like this we can show on fichinter the start and the end of the intervention
 2015-12-04 11:16:49 +01:00
BENKE Charlie
2c95344f05 Add date start and end of intervention 2015-12-04 11:09:05 +01:00
Laurent Destailleur
2b149aa514 Merge pull request #4148 from AlainRnet/develop 
Update fraise.modules.php
 2015-12-04 10:31:34 +01:00
Laurent Destailleur
53a8cb4475 Merge pull request #4130 from bafbes/develop 
add constant FICHINTER_EMPTY_LINE_DESC to allow empty line descriptions in interventions
 2015-12-04 10:30:51 +01:00
Laurent Destailleur
7d7a978ba0 Merge pull request #4145 from FHenry/3.8 
FIX :  Contract date inconsistency between /comm/card.php and #4089
 2015-12-04 10:25:50 +01:00
Laurent Destailleur
d2b221cfd1 Upgrade PHPCS rules 2015-12-04 10:22:27 +01:00
Raphaël Doursenaud
b45d4a2a51 [Qual] OOP detection of PHP MySQL driver 2015-12-03 22:31:13 +01:00
AlainRnet
ebc1105b5c Update fraise.modules.php 
following discussion with eldy (https://github.com/Dolibarr/dolibarr/pull/4079#issuecomment-161601400) to mix a french forum membre to select mailing member by type, I try to update this selector to integrate selection by type.
Thanks in advance for feedback
 2015-12-03 21:09:09 +01:00
Bahfir Abbes
fb692f4cd5 Update card.php 2015-12-03 19:10:15 +01:00
Laurent Destailleur
43ab23ca28 Fix doxygen 2015-12-03 14:54:39 +01:00