Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,180 Commits 36 Branches 189 Tags
815206cb15d8881e80c8eb2aaba905e77950e92e
Commit Graph

78180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pierre Ardoin
815206cb15 Add Project Title in header of pdf 
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
 2020-02-10 08:59:22 +01:00
Laurent Destailleur
6badf724cf FIX Mail smtps truncated if content has a line with single . 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-09 16:38:19 +01:00
Laurent Destailleur
53f740c60e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-09 16:37:19 +01:00
Laurent Destailleur
5fccbcc469 Merge pull request #13054 from hregis/10.0_mc 
FIX missing hook parameter
 2020-02-08 16:08:13 +01:00
Laurent Destailleur
b01e1e7724 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
Laurent Destailleur
9b9101dc2f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/tools/export_files.php
 2020-02-08 15:09:24 +01:00
Laurent Destailleur
5f5645a184 Merge pull request #13044 from ksar-ksar/10.0 
FIX : Warning on admin/export_files
 2020-02-08 15:05:44 +01:00
ksar
e951743077 Update export_files.php 
Remove Warning
 2020-02-08 15:04:27 +01:00
Laurent Destailleur
2a897ac91a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:02:49 +01:00
Laurent Destailleur
5fac824824 Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing 
FIX advanced target emailing sql and ergonomy
 2020-02-08 14:59:00 +01:00
Regis Houssin
a915a4faaf FIX missing hook parameter 2020-02-07 11:14:13 +01:00
Laurent Destailleur
78389e6c5d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-06 13:03:47 +01:00
Laurent Destailleur
387db16217 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:03:10 +01:00
Laurent Destailleur
e14612f569 FIX Filenames must not contains non ascii char or we will get non ascii 
char into the SMTP header.

Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-02-06 13:02:27 +01:00
ksar
23fc8321d5 FIX : Warning on admin/export_files 
#13041
 2020-02-06 12:55:35 +01:00
atm-arnaud
bd6d49f04a FIX advanced target emailing sql and ergonomy 2020-02-06 12:08:50 +01:00
Laurent Destailleur
1543028cdb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-05 19:38:02 +01:00
Laurent Destailleur
b6efd098dd Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-05 19:37:03 +01:00
Laurent Destailleur
1ef978ccc4 FIX #12966 2020-02-05 19:32:49 +01:00
Laurent Destailleur
a36cf1f86b Fix phpunit 2020-02-05 14:08:13 +01:00
Laurent Destailleur
334c69841a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-05 13:41:30 +01:00
Laurent Destailleur
796cdad6fc Merge pull request #13008 from hregis/10.0_mc 
FIX compatibility with multicompany (avoid duplicate data)
 2020-02-05 13:41:20 +01:00
Laurent Destailleur
9100b8a548 FIX SQL request and phpunit 2020-02-05 13:41:10 +01:00
Laurent Destailleur
c101c3dd55 Update holiday.class.php 2020-02-05 13:27:22 +01:00
Laurent Destailleur
d35994e5db Update holiday.class.php 2020-02-05 13:25:51 +01:00
Laurent Destailleur
b589db813e Merge pull request #13029 from OPEN-DSI/v10-fix-product-index-links 
FIX links in products/services index
 2020-02-05 13:05:35 +01:00
Laurent Destailleur
af22eb92d9 Merge pull request #13021 from mapiolca/patch-29 
Fix Compatbility with Multicompany
 2020-02-05 12:39:33 +01:00
Laurent Destailleur
63ba601906 Update box_project.php 2020-02-05 12:39:00 +01:00
VESSILLER
c3cf9e62b3 FIX links in products/services index 2020-02-05 11:31:02 +01:00
Pierre Ardoin
81ed70ffc7 Update box_project.php 2020-02-05 09:18:39 +01:00
Pierre Ardoin
d5b74a8ca3 Update box_project.php 2020-02-05 09:06:43 +01:00
Pierre Ardoin
262d889700 Update box_project.php 2020-02-05 08:50:51 +01:00
Pierre Ardoin
d93a597a1e Fix Compatbility with Multicompany 
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
 2020-02-04 09:17:02 +01:00
Laurent Destailleur
bf4fca0c7e Fix warning 2020-02-03 22:09:21 +01:00
Regis Houssin
e74e63941d FIX use "usergroup" instead "user" 2020-02-03 11:55:55 +01:00
Regis Houssin
bc3a210d12 FIX compatibility with multicompany (avoid duplicate data) 2020-02-03 11:46:18 +01:00
Laurent Destailleur
2813c9d4b4 FIX #12973 2020-02-03 06:31:40 +01:00
Laurent Destailleur
7c35e9aaa8 FIX #12932 2020-02-03 03:56:30 +01:00
Laurent Destailleur
54ef0e2074 Merge pull request #12987 from aspangaro/10.0_p34 
FIX: FEC export have specific name
 2020-02-02 20:24:04 +01:00
Alexandre SPANGARO
0229cd3c65 FIX: FEC export have specific name 2020-02-01 08:18:48 +01:00
Laurent Destailleur
a1b787bc08 Merge pull request #12958 from altatof/sellang 
FIX : default lang selection when filter
 2020-01-29 22:46:10 +01:00
Laurent Destailleur
c4ee95154d Merge pull request #12956 from altatof/fetch_account 
FIX : fetching account on current entity
 2020-01-29 22:41:43 +01:00
altairis
f1ea0ce5a1 better fix 2020-01-29 11:47:23 +01:00
Laurent Destailleur
d650258d39 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-01-29 11:38:17 +01:00
Laurent Destailleur
5d2130a5ae Fix SQL injection 2020-01-29 11:38:06 +01:00
altairis
3c3876eb59 FIX : default lang selection when filter 2020-01-29 11:32:24 +01:00
altairis
b04bb9e392 FIX : fetching account on current entity 2020-01-29 11:05:10 +01:00
Laurent Destailleur
ed8b6f346d Merge pull request #12946 from OPEN-DSI/v10-fix-categorie-full-arbo-match 
FIX regex for include or exclude categories in full arbo
 2020-01-28 20:39:22 +01:00