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

59924 Commits

Author SHA1 Message Date
ptibogxiv
21f4d474b4 Fix sql don.class.php 2018-11-28 16:11:10 +01:00
Laurent Destailleur
0373cad2cd FIX Method setValid not found 2018-11-28 16:11:00 +01:00
Juanjo Menent
2f61d29b06 FIX: #10080 Supplier translations are in english 2018-11-28 10:40:45 +01:00
Laurent Destailleur
b5c136bc32 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-26 23:02:23 +01:00
Laurent Destailleur
653b99cb33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-26 23:02:07 +01:00
Laurent Destailleur
ecb6ea9151
Merge pull request #10058 from frederic34/patch-2 
correct link and avoid warning in resource list
 2018-11-24 11:17:56 +01:00
fappels
322ce410d7 Add missing paid field in fetch sql 2018-11-23 09:42:43 +01:00
Laurent Destailleur
1d4c756783 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-22 11:44:37 +01:00
Laurent Destailleur
084516b885 Fix ip detection of geoip 2018-11-21 15:11:57 +01:00
Frédéric FRANCE
e8cac0df35
correct link and avoid warning in resource list 2018-11-21 14:06:06 +01:00
Laurent Destailleur
25ee999d27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:32 +01:00
Laurent Destailleur
20dbbaf5cc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:04 +01:00
Laurent Destailleur
fb6aa01207 FIX #10030 better german chart 2018-11-19 20:04:31 +01:00
Laurent Destailleur
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view 
FIX hidden extrafield
 2018-11-19 18:37:18 +01:00
Laurent Destailleur
8535844737 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:27:00 +01:00
Laurent Destailleur
1931fd33eb
Merge pull request #10041 from atm-ph/fix_8.0_optional_param 
Fix new params has been added not optional
 2018-11-19 18:26:21 +01:00
Laurent Destailleur
bd8856b988
Merge pull request #10033 from frederic34/patch-9 
Update CMailFile.class.php
 2018-11-19 18:20:20 +01:00
Laurent Destailleur
7a3f088fcb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:19:11 +01:00
Laurent Destailleur
77bc1c4313 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2018-11-19 18:18:43 +01:00
Laurent Destailleur
4bedeabc5b FIX #10036 2018-11-19 18:02:29 +01:00
gauthier
ecdfa5219b FIX : We want to be able to send PDF of paid invoices 2018-11-19 17:31:45 +01:00
Laurent Destailleur
2d09008610 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 15:55:59 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/card.php
 2018-11-19 15:55:41 +01:00
atm-ph
129034ba76 Fix new params has been added not optional 2018-11-19 15:46:30 +01:00
florian HENRY
dc2f1e9812 fix list agenda extrafield visibility 2018-11-19 11:25:48 +01:00
Frédéric FRANCE
30b1db34cd
Update CMailFile.class.php 2018-11-17 11:33:01 +01:00
Laurent Destailleur
f2bbb54b8f
Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist 
FIX : filter on product category doesn't work
 2018-11-15 16:44:40 +01:00
Laurent Destailleur
f3228dc4f8
Merge pull request #10010 from atm-john/Fix_cat_photo_upload 
Fix event message on upload category picture fail
 2018-11-15 16:43:59 +01:00
Laurent Destailleur
3ca45e0e40 Fix double dot in sql filename 2018-11-15 10:59:55 +01:00
gauthier
85dd0ec2dd FIX : filter on product category doesn't work 2018-11-13 15:24:53 +01:00
John BOTELLA
c6cf748ba7 Fix envent message on upload category picture 2018-11-13 14:44:10 +01:00
John BOTELLA
500bb7bc96 best conditions testing 2018-11-13 10:20:34 +01:00
gauthier
f404cae546 FIX : Same on customer card 2018-11-12 16:04:42 +01:00
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +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
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
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