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

65809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a08a0b4c1d
Merge pull request #10469 from atm-gauthier/7.0_fix_wrong_test_enabled 
FIX : wrong test enabled
 2019-02-01 15:34:55 +01:00
gauthier
caa937660d FIX : wrong test enabled 2019-01-31 12:43:39 +01:00
Laurent Destailleur
484b4371c1 FIX XSS 
Conflicts:
	htdocs/viewimage.php
 2019-01-31 10:19:23 +01:00
Laurent Destailleur
231395dab8
Merge pull request #10398 from atm-john/fix_trigger 
Fix missing trigger
 2019-01-30 18:53:10 +01:00
Laurent Destailleur
104364ed02
Merge pull request #10459 from atm-gauthier/7.0_FIX_cmd_fourn_enabled 
FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled
 2019-01-30 15:51:09 +01:00
Laurent Destailleur
8d9b92698d
Merge pull request #10443 from EuskalMoneta/7.0 
FIX Fix PHP warning "count(): Parameter must be an array..."
 2019-01-30 15:48:31 +01:00
gauthier
9490929216 FIX : $conf->fournisseur->commande->enabled doesn't exist, we must use $conf->fournisseur->enabled 2019-01-30 10:49:32 +01:00
Xebax
b24f5fda68 FIX Fix PHP warning "count(): Parameter must be an array..." 2019-01-29 08:47:46 +01:00
Laurent Destailleur
9d1a02b0d7 Fix language 2019-01-28 16:25:37 +01:00
John BOTELLA
6f12cdf236 Fix travis 2019-01-28 11:58:16 +01:00
John BOTELLA
5dbc9ddae0 fix travis 2019-01-28 11:56:20 +01:00
Laurent Destailleur
3e78807cbc
Merge pull request #10424 from EuskalMoneta/7.0 
FIX 'statut' is ignored when updating a user with the REST API.
 2019-01-27 17:56:14 +01:00
Xebax
94d3f038eb FIX 'statut' is ignored when updating a user with the REST API. 2019-01-27 13:20:33 +01:00
John BOTELLA
624d17c96a Fix missing no trigger arg 2019-01-23 17:32:49 +01:00
John BOTELLA
1c51716997 Fix missing trigger 2019-01-23 17:02:20 +01:00
Laurent Destailleur
b868397902 Fix colspan 2019-01-21 02:27:13 +01:00
Laurent Destailleur
1ac55b0800 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/security2.lib.php
 2019-01-19 13:19:58 +01:00
wdammak
aaa61254ac Update stats.class.php 
Fix div/0 warnings
 2019-01-19 11:36:09 +01:00
Laurent Destailleur
c1c3eb61f8
Merge pull request #10356 from atm-gauthier/6.0_fix_dol_loginfunction 
FIX : if(!function_exists(dol_loginfunction))
 2019-01-17 19:14:46 +01:00
Laurent Destailleur
cb59c97ef7
Merge pull request #10350 from a-schild/7.0 
Fix for issue #10333 branch 7.0
 2019-01-17 18:59:52 +01:00
gauthier
d997309bcb FIX : if(!method_exists(dol_loginfunction)) 2019-01-17 14:49:30 +01:00
Laurent Destailleur
476527e71e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-01-16 16:34:46 +01:00
Laurent Destailleur
6becdc8af4 Fix missing substitution of ID 2019-01-16 16:34:36 +01:00
a-schild
7e3bfd332e Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:07:00 +01:00
Laurent Destailleur
05dc40b6b9
Merge pull request #10331 from frederic34/patch-2 
correct list of links
 2019-01-15 17:52:05 +01:00
Frédéric FRANCE
cf55b54cf5
correct list of links 2019-01-14 10:02:48 +01:00
Laurent Destailleur
6ca163c68b
Merge pull request #10311 from ATM-Marc/FIX_7.0_hook_action_list 
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
 2019-01-08 14:06:24 +01:00
Laurent Destailleur
9a6c3ac3df FIX Selection of email recipient with option MAIN_OPTIMIZEFORTEXTBROWSER 2019-01-08 14:05:07 +01:00
Marc de Lima Lucio
68802c659e FIX: action list: add printFieldListSelect and printFieldListWhere hooks 2019-01-08 11:41:58 +01:00
Laurent Destailleur
8e3df45cbf Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/holiday/define_holiday.php
 2019-01-08 01:46:03 +01:00
Laurent Destailleur
3d578cab28
Merge pull request #10308 from EuskalMoneta/7.0 
FIX Civility not saved when creating a member.
 2019-01-07 14:10:00 +01:00
Xebax
fbb1b344d1 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-06 13:44:13 +01:00
Xebax
2c496d2ac0 FIX Civility not saved when creating a member. 2019-01-06 13:42:41 +01:00
Juanjo Menent
e8424ebec3
Merge pull request #10304 from simnandez/7.0 
Change to 7.0.6
 2019-01-05 14:47:24 +01:00
Juanjo Menent
74442911a7 Change to 7.0.6 2019-01-05 14:45:23 +01:00
Juanjo Menent
709d173669
Merge pull request #10303 from simnandez/7.0 
Fix #8152 and prepare 7.0.5
 2019-01-05 14:00:02 +01:00
Juanjo Menent
96967100ba Prepare 7.0.5 2019-01-05 13:35:32 +01:00
Juanjo Menent
7908550937 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-01-05 13:05:50 +01:00
Juanjo Menent
61fbfaf356
Merge pull request #10298 from fmarcet/7.0 
FIX: Can't generate invoice pdf
 2019-01-05 13:02:58 +01:00
Ferran Marcet
f3dd875fc7 FIX: Can't generate invoice pdf 2019-01-04 12:00:39 +01:00
Ferran Marcet
4694af0488 FIX: Can't generate invoice pdf 2019-01-04 11:45:02 +01:00
Ferran Marcet
3e358c90b3 Merge branch '7.0up' into 7.0 2019-01-04 11:32:19 +01:00
Ferran Marcet
15cc45b8ae FIX: Can't generate invoice pdf 2019-01-04 10:52:10 +01:00
Laurent Destailleur
66b2a82be6
Merge pull request #10292 from atm-gauthier/6.0_fix_holidays 
FIX : holidays get natural_search if search params are set only
 2019-01-02 20:04:39 +01:00
ldestailleur
8645a7f524 FIX Interface regression for bind people. Fix option 
MAIN_OPTIMIZEFORTEXTBROWSER
 2019-01-02 18:58:45 +01:00
gauthier
fc3da0f5be FIX : holidays get natural_search if search params are set only 2019-01-02 10:02:30 +01:00
Juanjo Menent
cf64053fa5 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-12-29 15:07:09 +01:00
Laurent Destailleur
b76c45e8d0
Merge pull request #10264 from hregis/7.0_price 
FIX avoid Class 'AdherentType' not found
 2018-12-22 18:16:40 +01:00
Regis Houssin
09ce84ca93 FIX avoid Class 'AdherentType' not found 2018-12-21 16:38:02 +01:00
Laurent Destailleur
ed13f7b729
Merge pull request #10252 from ATM-Nicolas/fix_call_to_update_price 
FIX : Function updatePrice with wrong parameters
 2018-12-19 13:02:00 +01:00