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

64295 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
8b20c5edab FIX Remove warning when using log into syslog 2017-09-08 15:46:06 +02:00
Laurent Destailleur
a6a142753a Fix bad label when account not set 2017-09-08 15:24:27 +02:00
Laurent Destailleur
87126343a6 Fix new menu 2017-09-08 15:03:08 +02:00
Laurent Destailleur
e2ccac68c5 Fix PHP7.2 2017-09-08 14:45:11 +02:00
Laurent Destailleur
75172966c2 Fix selection of email templates 2017-09-08 14:40:39 +02:00
Neil Orley
17da808325 FIX wrong basePath in the swagger view 
Behind a reverse proxy the basePath seems to be in http.
Forcing the basePath to DOL_MAIN_URL_ROOT fixes the problem.
 2017-09-08 14:35:44 +02:00
Laurent Destailleur
59721bf8ed Fix code comment 2017-09-08 13:33:52 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
48765eb28b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-08 13:24:24 +02:00
Laurent Destailleur
152416a6d7 Fix bad param 2017-09-08 13:24:10 +02:00
Laurent Destailleur
03fe9d4e97 Escape all status 2017-09-08 13:23:12 +02:00
Regis Houssin
d4c20a919d Fix: avoid warning 2017-09-08 12:52:56 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
AXeL-dev
a615a46a5a fix hidepricelabel when using ajax autocompleter 2017-09-08 11:06:55 +01:00
fappels
5a7a4964fe Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-09-08 11:37:46 +02:00
florian HENRY
1a389b6faf fix upload photo for categ 2017-09-08 10:36:45 +02:00
florian HENRY
34f08ce082 fix travis 2017-09-08 10:36:11 +02:00
florian HENRY
20ed279489 better fix 2017-09-08 10:34:38 +02:00
florian HENRY
da2f971345 fix upload images on category 2017-09-08 10:33:00 +02:00
Laurent Destailleur
835cd43565 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-08 10:09:41 +02:00
Laurent Destailleur
7dbd0bd355 FIX Some page of admin were not responsive 2017-09-08 10:09:22 +02:00
arnaud
fdd758abb4 FIX empty test on conf fortask comment was bad 2017-09-08 09:17:22 +02:00
arnaud
3a782856f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion 2017-09-08 09:15:02 +02:00
arnaud
7f5950c958 FIX multiple comments not reset on fetch 2017-09-08 09:14:34 +02:00
fappels
7c743eb7da Rename $extrafields because already used 2017-09-07 21:04:15 +02:00
Rui Strecht
9b64b064ce Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-09-07 18:28:13 +01:00
Laurent Destailleur
863c575580 Merge pull request #7342 from simnandez/5.0 
FIX: Bad link to unpayed suppliers invoices
 2017-09-07 18:09:56 +02:00
Laurent Destailleur
f92eded0a2 Merge pull request #7340 from Oeris/6.0-ficheinter 
NEW Adds an option to hide duration in the "intervention" module
 2017-09-07 18:07:14 +02:00
Laurent Destailleur
a97b87d2cd Merge pull request #7337 from fmarcet/6.0 
Fix: Credit card field showing too small
 2017-09-07 18:04:27 +02:00
Laurent Destailleur
faaebbf5e1 Merge pull request #7336 from hregis/6.0_bug3 
Fix: avoid "Uncaught Error: [] operator not supported for strings"
 2017-09-07 18:04:08 +02:00
Laurent Destailleur
6701ad8b73 Merge pull request #7334 from fappels/4.0_fix_export_missing_sup_discount_qty 
FIX missing supplier qty and supplier discount in available fields for product export.
 2017-09-07 18:02:58 +02:00
Laurent Destailleur
b9af2d6b97 Merge pull request #7331 from simnandez/6.0 
FIX: Bad const name
 2017-09-07 17:57:33 +02:00
Laurent Destailleur
3393947dbc Merge pull request #7329 from Jacques83300/5.0 
FIX Add some missing attributes in Adherent:makeSubstitution (type, phone…
 2017-09-07 17:57:05 +02:00
Laurent Destailleur
c546243f00 Merge pull request #7328 from Dolibarr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2017-09-07 17:56:24 +02:00
Juanjo Menent
7648d300b5 FIX: Bad link to unpayed suppliers invoices 2017-09-07 17:13:48 +02:00
arnaud
680fab313c NEW preload comments in task 2017-09-07 16:47:52 +02:00
arnaud
82440fd399 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_task_discussion 2017-09-07 16:24:34 +02:00
arnaud
8906c95eea NEW comments system on task 2017-09-07 16:23:51 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Neil Orley
e43b13968e New: Adds an hide hour button in the "intervention" module 
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
 2017-09-07 15:31:19 +02:00
Laurent Destailleur
a9e44a2cf5 NEW Enhance the anti XSS filter 2017-09-07 13:54:49 +02:00
Laurent Destailleur
cff9ff01c8 Better disconnect with exotic connection mode 2017-09-07 13:30:18 +02:00
Neil Orley
b5c30ea679 New: Adds an hide duration button in intervention module 
Adds a way to set the visibility of the intervention time field from the administration interface of the "intervention" module
 2017-09-07 11:58:22 +02:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-07 10:50:35 +02:00
Maxime Kohlhaas
18cbe31a84 Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0 2017-09-07 09:10:24 +02:00
Laurent Destailleur
53a2ef45a5 Fix upgrade 2017-09-06 22:42:01 +02:00
Laurent Destailleur
451adb077f Fix upgrade 2017-09-06 22:41:29 +02:00
Laurent Destailleur
4bbd42123e Fix mysqldump (missing fields) 2017-09-06 22:02:44 +02:00
Laurent Destailleur
08eff908bc Fix missing field in some env 2017-09-06 21:39:33 +02:00
Laurent Destailleur
17310da0f8 Fix missing field in some env 2017-09-06 21:39:10 +02:00