Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,061 Commits 36 Branches 189 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

62102 Commits

Author SHA1 Message Date
Laurent Destailleur
01e7b5747d FIX user param is null not 0 when not defined 
FIX properties email_xx were not set
 2018-11-12 15:27:59 +01:00
Laurent Destailleur
5a7cb95b72 FIX filter on entity must be done as soon as we don't search on rowid. 2018-11-12 14:49:08 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
ca3510e889 Merge pull request #9994 from ptibogxiv/patch-91 
Fix Invalid argument supplied for foreach()
 2018-11-11 17:30:06 +01:00
Laurent Destailleur
cda88f4df9 Merge pull request #9993 from ptibogxiv/patch-90 
Fix Invalid argument supplied for foreach()
 2018-11-11 17:29:32 +01:00
Laurent Destailleur
4f7d3e794a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-11 17:28:29 +01:00
Laurent Destailleur
f022be3a47 FIX #9992 2018-11-11 17:28:17 +01:00
Laurent Destailleur
65d8f59321 Merge pull request #9992 from delcroip/patch-18 
to support proposal_supplier insert
 2018-11-11 17:27:23 +01:00
Laurent Destailleur
2985d9cfbf Update 8.0.0-9.0.0.sql 2018-11-11 17:27:16 +01:00
Laurent Destailleur
f39b99b153 Merge pull request #9933 from ptibogxiv/patch-83 
Update Stripe Version API
 2018-11-11 17:25:49 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Laurent Destailleur
0b57faa7b4 Fix help 2018-11-11 14:42:11 +01:00
Laurent Destailleur
de259e9db6 Code comment 2018-11-11 14:36:35 +01:00
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +01:00
ptibogxiv
80782a366e Fix Invalid argument supplied for foreach() 2018-11-10 15:04:38 +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
ptibogxiv
5c96689c87 Fix Invalid argument supplied for foreach() 2018-11-10 15:02:50 +01:00
delcroix Patrick
52f35d8038 to support proposal_supplier insert 
proposal_supplier has 17 char when the elementtype column can take only 16 char
 2018-11-10 14:59:46 +01:00
Laurent Destailleur
ed3a333436 Fix phpcs 2018-11-10 13:11:18 +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
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
ptibogxiv
20a3dd86cd 2018-11-08 
no change for dolibarr but better for integration and development
 2018-11-10 11:07:01 +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
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +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
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