Laurent Destailleur
|
f51b02026c
|
Fix regression
|
2020-10-30 04:24:06 +01:00 |
|
Laurent Destailleur
|
f22017080d
|
Fix for php8
|
2020-10-30 03:25:33 +01:00 |
|
Laurent Destailleur
|
cfcac7e053
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/lib/functions2.lib.php
|
2020-10-22 17:34:48 +02:00 |
|
Laurent Destailleur
|
31f1ab73b1
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-10-22 17:31:29 +02:00 |
|
Florian Mortgat
|
529dfb8dfb
|
FIX 9.0 - supplier proposals as linked objects of events are not correctly fetched
|
2020-10-20 16:37:15 +02:00 |
|
Laurent Destailleur
|
989074f13a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-10-06 13:13:31 +02:00 |
|
ptibogxiv
|
dd1904c521
|
Fix multicompany in last action box
|
2020-10-04 13:58:46 +02:00 |
|
Laurent Destailleur
|
5c9ad3ec9b
|
Update files.lib.php
|
2020-09-27 18:55:09 +02:00 |
|
Florian HENRY
|
5ff7e37696
|
review code
|
2020-09-27 18:05:19 +02:00 |
|
Florian HENRY
|
b6b2553501
|
Merge branch '11.0' into 11.0_fixmultidiroutput
|
2020-09-27 18:02:22 +02:00 |
|
Laurent Destailleur
|
f09aea90df
|
Fix bad test
|
2020-09-18 14:51:04 +02:00 |
|
Laurent Destailleur
|
56a9f5c48b
|
Fix
|
2020-09-18 14:49:20 +02:00 |
|
Laurent Destailleur
|
07556e061d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
|
2020-09-18 14:46:23 +02:00 |
|
Alexandre SPANGARO
|
bc457ebb66
|
Stickler
|
2020-09-16 21:22:59 +02:00 |
|
Alexandre SPANGARO
|
23c4cfe913
|
FIX Yogosha report 4425 (backport)
|
2020-09-16 20:55:28 +02:00 |
|
Laurent Destailleur
|
723a263cd3
|
Fix phpcs
|
2020-08-29 05:07:23 +02:00 |
|
Laurent Destailleur
|
f819509442
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-08-23 19:22:27 +02:00 |
|
Laurent Destailleur
|
74eac1d06a
|
Fix include regression
|
2020-08-23 19:22:01 +02:00 |
|
Laurent Destailleur
|
38d53cc03d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/lib/pdf.lib.php
|
2020-08-23 19:20:50 +02:00 |
|
Laurent Destailleur
|
4fa6d86127
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-08-23 19:17:01 +02:00 |
|
Laurent Destailleur
|
7a183ea026
|
Update pdf.lib.php
|
2020-08-23 19:13:30 +02:00 |
|
Laurent Destailleur
|
b44d6744f9
|
Update pdf.lib.php
|
2020-08-23 19:11:40 +02:00 |
|
Laurent Destailleur
|
7eb003c684
|
Update pdf.lib.php
|
2020-08-23 19:11:19 +02:00 |
|
Laurent Destailleur
|
d21bda604d
|
FIX Setup of stock increase/decrease
|
2020-08-18 15:27:17 +02:00 |
|
Laurent Destailleur
|
487d26c7db
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
|
2020-08-17 19:54:23 +02:00 |
|
John Botella
|
6e1702c1a5
|
Fix infinite fetch object linked loop
|
2020-08-17 15:00:31 +02:00 |
|
lvessiller
|
f385e02c53
|
FIX title button attribute id empty
|
2020-08-13 17:43:18 +02:00 |
|
florian HENRY
|
c4d8a25c5a
|
fix external module multidiroutput
|
2020-08-10 13:40:55 +02:00 |
|
Laurent Destailleur
|
ada7b74ba1
|
Fix phpcs
|
2020-08-07 14:56:30 +02:00 |
|
Laurent Destailleur
|
5482a3134a
|
Merge pull request #14355 from fmarcet/10.0
Fix: User can see events that are not assigned to it
|
2020-08-07 14:54:39 +02:00 |
|
Laurent Destailleur
|
284378232b
|
Merge pull request #14373 from atm-john/11.0_fix_bad_usage_of_moreparam
FIX : JS CRASH - bad usage of moreparam
|
2020-08-07 10:10:09 +02:00 |
|
Laurent Destailleur
|
37f1b27bd2
|
Fix phpcs
|
2020-08-06 03:55:47 +02:00 |
|
Laurent Destailleur
|
b40177a8c8
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-06 03:00:16 +02:00 |
|
Laurent Destailleur
|
641d9a6565
|
Fix number to string
|
2020-08-06 02:58:07 +02:00 |
|
Laurent Destailleur
|
ce960c8d0d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-06 02:53:19 +02:00 |
|
Laurent Destailleur
|
0b7aec1fa0
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/core/lib/functionsnumtoword.lib.php
|
2020-08-06 02:52:54 +02:00 |
|
Laurent Destailleur
|
73ea5b0e2d
|
Fix function to convert price to string
|
2020-08-06 02:50:24 +02:00 |
|
stickler-ci
|
8d88217434
|
Fixing style errors.
|
2020-08-04 14:48:15 +00:00 |
|
Ferran Marcet
|
70ad2fcee0
|
Fix: User can see events that are not assigned to it
|
2020-08-04 16:45:57 +02:00 |
|
Ferran Marcet
|
7a077a2d99
|
Fix: User can see events that are not assigned to it
|
2020-08-04 16:45:04 +02:00 |
|
Ferran Marcet
|
1a62a36b86
|
Merge remote-tracking branch 'origin/10.0' into 10.0
|
2020-08-04 16:40:01 +02:00 |
|
Ferran Marcet
|
7b6ef7aca8
|
Merge branch '10.0up' into 10.0
|
2020-08-04 16:39:40 +02:00 |
|
John Botella
|
11f14b8fe5
|
Fix bad usage of moreparam
|
2020-08-04 14:13:52 +02:00 |
|
stickler-ci
|
9926eac192
|
Fixing style errors.
|
2020-08-03 09:26:36 +00:00 |
|
quentin
|
72b2fb442b
|
fix test libelle
|
2020-08-03 11:17:39 +02:00 |
|
Ferran Marcet
|
63b15dd1b6
|
Fix: User can see events that are not assigned to it
|
2020-08-03 11:17:30 +02:00 |
|
Laurent Destailleur
|
930ae84dac
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contact/list.php
htdocs/core/lib/pdf.lib.php
|
2020-07-29 13:50:31 +02:00 |
|
Laurent Destailleur
|
566f683c54
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-07-29 13:40:19 +02:00 |
|
VERDOL Gauthier
|
25994e61bc
|
FIX : We need to see unit line on PDF even though it's an option
|
2020-07-27 16:04:21 +02:00 |
|
Laurent Destailleur
|
fd95551940
|
Fix upload of file in import module
Conflicts:
htdocs/core/lib/security.lib.php
|
2020-07-09 21:52:27 +02:00 |
|