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

68679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
1c15d249b3
replace specific php7 code 2018-11-14 22:05:21 +01:00
Laurent Destailleur
9447e66da1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-10 15:51:04 +01:00
Laurent Destailleur
7f0ede0c39 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-10 15:50:48 +01:00
Laurent Destailleur
c492b3328b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-10 15:50:00 +01:00
Laurent Destailleur
edc59b9290 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-11-10 15:49:20 +01:00
Laurent Destailleur
24c499aa44 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-11-10 15:48:53 +01:00
Laurent Destailleur
8eac45a762 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2018-11-10 15:48:07 +01:00
Laurent Destailleur
3d85407619 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2018-11-10 15:46:31 +01:00
Laurent Destailleur
ca1e3b4d55 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2018-11-10 15:15:33 +01:00
Laurent Destailleur
94bb1ac511 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2018-11-10 12:49:22 +01:00
Laurent Destailleur
5ec602cafa
Merge pull request #9983 from hregis/8.0_bug 
FIX missing field "visible"
 2018-11-10 12:19:35 +01:00
Laurent Destailleur
a12c0d9b53
Merge pull request #9982 from hregis/8.0_pg 
FIX missing action "edit" for the hook
 2018-11-10 12:17:33 +01:00
Laurent Destailleur
8893d8d59f Fix compatiblity with new version of PHP 2018-11-10 11:56:23 +01:00
Regis Houssin
ee06f36f4c FIX missing field "visible" 2018-11-09 11:36:20 +01:00
Regis Houssin
5d1d77a966 FIX missing action "edit" for the hook 2018-11-09 10:32:08 +01:00
Laurent Destailleur
9bced281db Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-09 01:28:47 +01:00
Laurent Destailleur
d827601857 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-09 01:25:35 +01:00
Laurent Destailleur
aad0b700d4 Fix travis 2018-11-09 01:22:56 +01:00
Laurent Destailleur
f889c9994b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-11-09 01:21:13 +01:00
Laurent Destailleur
0d6709c9f7 Update phpcs config 2018-11-09 01:20:57 +01:00
Laurent Destailleur
8a89da25c6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/margin/tabs/thirdpartyMargins.php
 2018-11-08 20:18:13 +01:00
Laurent Destailleur
400b48bd9b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:59 +01:00
Laurent Destailleur
9012f6ecc5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-08 20:14:40 +01:00
Laurent Destailleur
1b8649be6f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 20:14:02 +01:00
Laurent Destailleur
d6bd325f70
Merge pull request #9980 from atm-john/fix_supplier_order_list_socid 
FIX supplier order list keep socid
 2018-11-08 20:13:52 +01:00
Laurent Destailleur
9a31a61c9d FIX #9971 2018-11-08 20:05:01 +01:00
Laurent Destailleur
f919e6ddb0
Merge pull request #9971 from atm-gauthier/FIX_langs_projet 
FIX : OppStatusShort doesn't exists
 2018-11-08 20:00:49 +01:00
Laurent Destailleur
76ac3bd457 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 19:57:42 +01:00
Laurent Destailleur
be788e6167 FIX responsive 2018-11-08 19:57:31 +01:00
Laurent Destailleur
e84e7f02c8
Merge pull request #9963 from atm-john/fix_marge_sign 
FIX marge sign
 2018-11-08 19:37:52 +01:00
Laurent Destailleur
01baddb096
Merge pull request #9959 from hregis/8.0_bug 
FIX export only prices of the current entity !
 2018-11-08 19:26:09 +01:00
Laurent Destailleur
d1aabf9566
Merge pull request #9976 from atm-john/fix_warning 
FIX Warning: count()
 2018-11-08 19:25:32 +01:00
Laurent Destailleur
78778e4c58
Merge pull request #9948 from frederic34/patch-9 
FIX mode is only customer in stats fichinter
 2018-11-08 19:16:00 +01:00
Laurent Destailleur
588de2cc86 Fix filter on entity on project 2018-11-08 18:45:02 +01:00
Laurent Destailleur
27dcf18637 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-08 18:43:31 +01:00
Laurent Destailleur
e92a63ba73 FIX If we change customer/supplier rule we can't edit old thirdparty. 2018-11-08 17:15:35 +01:00
John BOTELLA
98548337ae FIX supplier order list keep socid 2018-11-08 15:38:25 +01:00
Frédéric FRANCE
8bb1545ed0
Update index.php 2018-11-08 12:16:05 +01:00
Frédéric FRANCE
670eed1e68
Update index.php 2018-11-08 12:13:07 +01:00
John BOTELLA
7c4dad2728 FIX Warning: count() 2018-11-08 12:12:45 +01:00
Laurent Destailleur
c55f83b0b7 Fix multicompany filter missing 2018-11-08 11:25:29 +01:00
gauthier
70826c3191 FIX : same on lines 2018-11-07 16:32:23 +01:00
gauthier
05a679a10c FIX : OppStatusShort doesn't exists 2018-11-07 16:26:25 +01:00
John BOTELLA
9d780a1722 Fix sign 2018-11-07 10:11:29 +01:00
Regis Houssin
d32fd9fda5 FIX export only prices of the current entity ! 2018-11-06 18:08:29 +01:00
Laurent Destailleur
7e33af6677 Fix max size 2018-11-06 17:40:59 +01:00
Laurent Destailleur
52aa860008 Code comment 2018-11-06 09:39:22 +01:00
Laurent Destailleur
f0305a7beb Prepare 8.0.4 2018-11-05 13:50:12 +01:00
Laurent Destailleur
4c591daab1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
 2018-11-05 10:39:22 +01:00
Laurent Destailleur
56a70ab4e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 10:23:15 +01:00