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

72623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2a2fcf6784 FIX only profid1 to 4 were editable for pdf option to show. Not 5 and 6. 2019-05-20 15:38:33 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-05-19 02:03:16 +02:00
Laurent Destailleur
0f3ae6dc39
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type 
FIX: invoice class: bad SQL request if product type not set
 2019-05-19 01:58:13 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
Laurent Destailleur
684cbbdddb
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey 
FIX: modulebuilder: hardcoded llx_
 2019-05-19 01:55:02 +02:00
Laurent Destailleur
234ad4c76a
Merge pull request #11214 from atm-maxime/7.0 
Fix #8344
 2019-05-19 01:53:13 +02:00
Laurent Destailleur
32485c2782 Fix phpcs 2019-05-19 01:45:33 +02:00
ATM-Marc
83c38570e9 FIX: invoice class: bad SQL request if product type not set 2019-05-19 01:01:21 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
Laurent Destailleur
3e3ed6f9e7 Fix phpcs 2019-05-18 20:11:51 +02:00
ATM-Marc
9b805f742b FIX: modulebuilder: hardcoded llx_ 2019-05-18 20:09:00 +02:00
Laurent Destailleur
34b5399329
Merge pull request #11209 from atm-maxime/fix_holiday_missing_stats 
Fix holiday missing stats
 2019-05-18 19:33:36 +02:00
Maxime Kohlhaas
4f64250ad6 Fix menu links for holidays 2019-05-18 17:12:25 +02:00
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
ba88d89ff5
Merge pull request #11195 from ATM-Marc/FIX_7.0_presend_file_overwrite 
FIX: mail presend: can overwrite a file previously uploaded (Issue #11056)
 2019-05-18 00:52:29 +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
ATM-Marc
b85ed3e0b7 FIX: mail presend: can overwrite a file previously uploaded 2019-05-18 00:11:15 +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