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

72594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Maxime Kohlhaas
1af69d4c8f Fix varnames in invoice api 2019-05-18 00:40:29 +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
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
atm-arnaud
4c90ba1a64 FIX attached files list with link file was broked 2019-05-09 12:11:18 +02:00
Laurent Destailleur
50563ab126 Prepare 9.0.3 2019-05-08 22:03:16 +02:00
Laurent Destailleur
7883ac4a8d Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-08 22:01:46 +02:00
Laurent Destailleur
08fcfded76 Prepare 9.0.3 2019-05-08 22:00:13 +02:00
Laurent Destailleur
541da011a4 Prepare 9.0.2 2019-05-08 21:59:55 +02:00
Laurent Destailleur
c2abedeb24 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-08 21:43:57 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
Laurent Destailleur
b5d8bc732d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-08 18:22:11 +02:00
Laurent Destailleur
af436b6559 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-08 18:21:17 +02:00
Laurent Destailleur
f2e24ed96e Fix bad contact used 2019-05-08 18:20:28 +02:00
Laurent Destailleur
21c355dd9d
Merge pull request #11133 from aspangaro/9.0_lettering 
FIX sortfield on lettering function
 2019-05-08 01:59:27 +02:00
Laurent Destailleur
12409e944c Fix duplicate error message 2019-05-07 22:57:27 +02:00
gauthier
f661b926fa FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf 
Example : if you upload a file like "my  file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
 2019-05-07 14:33:17 +02:00