lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,208 Commits 43 Branches 150 Tags 886 MiB
11ff3f6562
Commit Graph

68528 Commits

Author SHA1 Message Date
Laurent Destailleur
11ff3f6562 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-23 23:31:03 +01:00
Laurent Destailleur
530930b7aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-23 23:30:38 +01:00
Maxime Kohlhaas
0ab16ed5ae Fix #10179 discount split 2020-02-23 16:50:24 +01:00
gmilad
559fc9f61e
Update note.php 
Fix : #13168
 2020-02-22 13:07:25 +01:00
Ferran Marcet
9ff424e23b FIX: Visualization rights correction on last modified contacts box 2020-02-20 11:45:46 +01:00
Laurent Destailleur
fa16063875 Fix bad accounting code set 2020-02-18 22:39:01 +01:00
Laurent Destailleur
8d9577137a
Merge pull request #13130 from hregis/10.0_mc2 
FIX Multicompany compatibility
 2020-02-18 22:28:15 +01:00
Regis Houssin
110a23623b FIX an external user can not approved 2020-02-18 11:04:11 +01:00
Regis Houssin
4511cf1060 FIX missing "statut" for getNomUrl() function 2020-02-18 09:03:25 +01:00
Regis Houssin
1034e4a472 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_mc2 2020-02-18 09:02:35 +01:00
Regis Houssin
f6f0d9d4a2 FIX better method to check user rights AND usergroup rights ! 2020-02-18 08:35:51 +01:00
Regis Houssin
a5de331410 FIX Multicompany compatibility 2020-02-17 19:13:37 +01:00
gauthier
523d09536c FIX : must be == and not = 2020-02-17 12:20:19 +01:00
Laurent Destailleur
3bc122ecf6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-14 19:05:58 +01:00
Alexandre SPANGARO
72e59e6fe2 FIX: Force FEC export to txt format 2020-02-14 16:07:06 +01:00
Laurent Destailleur
5be0485917 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-12 22:51:05 +01:00
Laurent Destailleur
700e01d661 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
 2020-02-12 22:50:56 +01:00
Laurent Destailleur
d70712fd61
Merge pull request #13089 from mapiolca/patch-31 
Fix the display of the banner with multicompany
 2020-02-12 18:51:08 +01:00
Laurent Destailleur
50f0b61f1e
Update bankjournal.php 2020-02-12 18:50:33 +01:00
Pierre Ardoin
c7181830fc
Fix the display of the banner with multicompany 
Before : if a account of a entity require to define the Journal code, Banner displayed in all entities.

Now : Show the banner only in the entity concerned.
 2020-02-12 09:11:39 +01:00
Alexandre SPANGARO
c77169ad87 FIX : Problem with column label in subscription list 2020-02-10 16:01:09 +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
102428a503 Merge pull request #13056 from atm-lena/FIX_cabyprodlist_filter 
FIX CA by prod list filter
 2020-02-08 16:09:18 +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
ksar
e951743077 Update export_files.php 
Remove Warning
 2020-02-08 15:04:27 +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
atm-lena
ecea726323 FIX CA by prod list filter 2020-02-07 15:01:37 +01:00
Regis Houssin
a915a4faaf FIX missing hook parameter 2020-02-07 11:14:13 +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
atm-arnaud
bd6d49f04a FIX advanced target emailing sql and ergonomy 2020-02-06 12:08:50 +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
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