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

71040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +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
6591cdba75 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:03:34 +01:00
Laurent Destailleur
ed3a333436 Fix phpcs 2018-11-10 13:11:18 +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
776d5e6fc6
Merge pull request #9988 from frederic34/patch-15 
The variable $i seems to be never defined.
 2018-11-10 12:20:09 +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
2946ca60cf
Merge pull request #9989 from frederic34/patch-16 
Update actions_ticket.class.php
 2018-11-10 12:18:37 +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
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim 
add admin dkim translation
 2018-11-10 12:16:43 +01:00
Laurent Destailleur
bae1ff67a4
Merge pull request #9986 from frederic34/patch-9 
remove warning
 2018-11-10 12:16:10 +01:00
Laurent Destailleur
8893d8d59f Fix compatiblity with new version of PHP 2018-11-10 11:56:23 +01:00
Frédéric FRANCE
20acf440a3
Update api_products.class.php 2018-11-10 07:55:01 +01:00
Frédéric FRANCE
c2ee9ba9db
Update actions_ticket.class.php 2018-11-10 07:38:55 +01:00
Frédéric FRANCE
2514cf4a96
Update actions_ticket.class.php 2018-11-10 07:32:22 +01:00
Frédéric FRANCE
b271e1a3b0
The variable $i seems to be never defined. 2018-11-10 07:27:20 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3 Work on emailcollector 2018-11-09 18:18:17 +01:00
Frédéric FRANCE
172468587d
Update mymodulewidget1.php 2018-11-09 18:13:13 +01:00
Frédéric FRANCE
6cd27d8c80
add admin dkim translation 2018-11-09 18:08:06 +01:00
Frédéric FRANCE
1fd398234f
remove warning 2018-11-09 15:29:49 +01:00
Laurent Destailleur
773e2da4cc Fix example of number for holiday 2018-11-09 11:41:27 +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
f1193ad3dd FIX: Missing date creation and modification of supplier price 2018-11-09 10:29:22 +01:00
Laurent Destailleur
4946de9533 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/setup/codesniffer/ruleset.xml
 2018-11-09 01:32:47 +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
9d15f83f4c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-08 20:19:45 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +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
b26867c027
Merge pull request #9977 from ptibogxiv/patch-89 
FIX API for document download
 2018-11-08 20:09:08 +01:00
Laurent Destailleur
4ced94f5fd
Merge pull request #9974 from frederic34/previewimage 
can click on image to preview in doc list
 2018-11-08 20:06:38 +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