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

72607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxime Kohlhaas
ea4dcbc77a Add translation 2019-05-18 17:07:55 +02:00
Maxime Kohlhaas
6c195d7bdf Add warning delay for holidays 2019-05-18 17:07:29 +02:00
Maxime Kohlhaas
ea1efa5e88 Fix missing dashboard stats for holidays 2019-05-18 17:06:33 +02:00
Maxime Kohlhaas
28a4785b3a Fix missing TOKEN 2019-05-18 17:06:23 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00
Laurent Destailleur
d4f356c8f6
Merge pull request #11200 from atm-maxime/fix_project_beluga 
Fix project beluga order status
 2019-05-18 02:16:50 +02:00
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00
Laurent Destailleur
92dbc3ec1f
Merge pull request #11199 from atm-maxime/fix_resource_deletefile 
Fix resource delete with attached file
 2019-05-18 00:59:35 +02:00
Laurent Destailleur
b5187db6d0
Merge pull request #11198 from atm-maxime/fix_api_varname 
Fix varnames in invoice api
 2019-05-18 00:59:03 +02:00
Laurent Destailleur
68118e55dc
Update api_invoices.class.php 2019-05-18 00:58:43 +02:00
Laurent Destailleur
590ee589c1
Merge pull request #11192 from atm-maxime/fix_usertab_hr 
Fix : display hr tab on user if rights to read all
 2019-05-18 00:48:06 +02:00
Maxime Kohlhaas
aed71be7f1 Fix resource delete with attached file 2019-05-18 00:47:32 +02:00
Maxime Kohlhaas
1af69d4c8f Fix varnames in invoice api 2019-05-18 00:40:29 +02:00
Maxime Kohlhaas
2a2f0557cf Fix : display hr tab on user if rights to read all 2019-05-17 17:07:38 +02:00
Laurent Destailleur
e2408fb54d
Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display 
fix useless calculation
 2019-05-13 20:20:01 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
atm-greg
644f247910 fix useless calculation 2019-05-13 12:02:46 +02:00
Laurent Destailleur
1626c9fb6e
Merge pull request #11145 from atm-gauthier/8.0_fix_filename_with_two_spaces 
FIX : use dol_sanitizeFileName() function to remove double spaces in …
 2019-05-13 12:01:05 +02:00
Laurent Destailleur
c67d79a4e2
Update files.lib.php 2019-05-13 12:00:13 +02:00
Juanjo Menent
072a455ca4 Prepare 8.0.6 2019-05-11 22:55:42 +02:00
Juanjo Menent
7041c3246e Prepare 8.0.5 2019-05-11 22:35:56 +02:00
Juanjo Menent
40229c9d96
Merge pull request #11166 from simnandez/8.0 
Merge branch '7.0' into 8.0
 2019-05-11 18:06:20 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
 2019-05-11 17:31:23 +02:00
Juanjo Menent
3a99ef7319 Fix: missing GETPOST params 2019-05-11 17:04:05 +02:00
Juanjo Menent
3ae2d71ea6 Fix: missing GETPOST params 2019-05-11 17:00:55 +02:00
Juanjo Menent
91ae365588 Fix: missing GETPOST params 2019-05-11 16:58:00 +02:00
Juanjo Menent
6206519456 Fix: missing GETPOST params 2019-05-11 16:54:56 +02:00
Juanjo Menent
2e6cb2afaa Fix: missing GETPOST params 2019-05-11 16:53:16 +02:00
Juanjo Menent
dc9f8a349f Fix: missing GETPOST params 2019-05-11 16:50:31 +02:00
Juanjo Menent
80ef97e215 FIX: #11025 2019-05-11 16:41:01 +02:00
Juanjo Menent
759427f6ac FIX: #11025 2019-05-11 16:36:35 +02:00
Juanjo Menent
81bf7d07e3 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-05-11 16:32:02 +02:00
Laurent Destailleur
eed2b97913 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-10 17:40:53 +02:00
Laurent Destailleur
069df82380 FIX javascript error when ckeditor module not enabled 2019-05-10 17:40:34 +02:00
Laurent Destailleur
46ecdb8d4d
Merge pull request #11155 from simnandez/9.0 
FIX: #11097
 2019-05-10 16:27:59 +02:00
Laurent Destailleur
95326c3d63
Update list.php 2019-05-10 16:27:38 +02:00
Laurent Destailleur
22c548e80b Fix sql 2019-05-10 14:46:43 +02:00
Laurent Destailleur
14b11b3cc5 Prepare 9.0.4 2019-05-10 14:43:01 +02:00
Laurent Destailleur
5625c94c44 Fix missing label on project tooltip 2019-05-10 14:40:15 +02:00
Juanjo Menent
72dd3705ed Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-05-10 09:13:33 +02:00
Juanjo Menent
2df026b903 FIX: #11032 2019-05-09 20:59:22 +02:00
Juanjo Menent
e36df726a1 Merge remote-tracking branch 'upstream/9.0' into 9.0 2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1 FIX: #11097 2019-05-09 20:39:30 +02:00
Laurent Destailleur
6b626ab12c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-09 15:41:30 +02:00
Laurent Destailleur
d53117da3f Update log 2019-05-09 15:34:42 +02:00
Laurent Destailleur
1e970fa8d7
Merge pull request #11151 from atm-arnaud/FIX_linkedfiles_in_attached_files_was_broked 
FIX attached files list with link file was broked
 2019-05-09 15:05:51 +02:00
Laurent Destailleur
bf3de83c5d Fix typo 2019-05-09 12:45:14 +02:00
Laurent Destailleur
677b333d0a FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick 
hack to fix output pb).
 2019-05-09 12:38:00 +02:00
Laurent Destailleur
af8d2e0e1a Fix error message when module disabled 2019-05-09 12:31:51 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +02:00