Laurent Destailleur
|
afe1ec633b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-06-12 10:07:21 +02:00 |
|
Laurent Destailleur
|
2d52537106
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-06-12 10:07:08 +02:00 |
|
Laurent Destailleur
|
1b6b471cb7
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-12 10:06:43 +02:00 |
|
Laurent Destailleur
|
8447259f25
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-12 10:06:34 +02:00 |
|
Laurent Destailleur
|
420f3bbdab
|
FIX #11316
|
2019-06-12 10:05:53 +02:00 |
|
Laurent Destailleur
|
8f612bc1b2
|
Merge pull request #11314 from atm-maxime/fix_missing_hookparam
Fix missing massaction hook params
|
2019-06-12 09:21:15 +02:00 |
|
Maxime Kohlhaas
|
0ce2c2aab5
|
Fix missing massaction hook params
|
2019-06-10 10:11:26 +02:00 |
|
Laurent Destailleur
|
91a5547362
|
Merge pull request #11307 from frederic34/patch-7
Warning: A non-numeric value encountered
|
2019-06-07 18:11:09 +02:00 |
|
Laurent Destailleur
|
b36f80ab2e
|
Merge pull request #11306 from frederic34/patch-6
Parameter must be array or object that implements Countable
|
2019-06-07 18:10:03 +02:00 |
|
Laurent Destailleur
|
b73d287953
|
Update agenda.lib.php
|
2019-06-07 18:09:43 +02:00 |
|
Laurent Destailleur
|
4ed7e281c5
|
Merge pull request #11301 from frederic34/patch-5
avoid warning with php 7.2
|
2019-06-07 15:08:49 +02:00 |
|
Laurent Destailleur
|
63d9e963b8
|
Merge pull request #11310 from atm-josselin/FIX_display_intervention_model_button
Display the intervention button only in develop mode
|
2019-06-07 15:08:07 +02:00 |
|
Laurent Destailleur
|
2e201abac0
|
Merge pull request #11308 from atm-maxime/8.0
Fix multicurrency setup page
|
2019-06-07 15:07:42 +02:00 |
|
Laurent Destailleur
|
deb9ac25a8
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0
|
2019-06-06 19:08:26 +02:00 |
|
Laurent Destailleur
|
3ff154c1d0
|
Fix sql error
|
2019-06-06 19:05:47 +02:00 |
|
atm-josselin
|
c8ab7dee45
|
Display the intervention button only in develop mode
|
2019-06-06 16:34:44 +02:00 |
|
Maxime Kohlhaas
|
9c7c1ddceb
|
Fix multicurrency setup page
|
2019-06-06 11:20:10 +02:00 |
|
Frédéric FRANCE
|
ad95b66842
|
Warning: A non-numeric value encountered
|
2019-06-06 10:12:01 +02:00 |
|
Frédéric FRANCE
|
f11db8396a
|
Parameter must be array or object that implements Countable
warning with php 7.2
|
2019-06-06 09:49:32 +02:00 |
|
Frédéric FRANCE
|
ca6a624112
|
avoid warning with php 7.2
|
2019-06-05 13:55:47 +02:00 |
|
Laurent Destailleur
|
ab77051317
|
Fix time delay for purge
|
2019-06-04 20:03:27 +02:00 |
|
Laurent Destailleur
|
ba68e3d7ff
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/website/class/website.class.php
|
2019-06-04 18:47:22 +02:00 |
|
Laurent Destailleur
|
36df2f1026
|
Fix css
|
2019-06-04 18:45:01 +02:00 |
|
Laurent Destailleur
|
7b3242693b
|
FIX default value for duration of validity can be set from generic
feature.
|
2019-06-04 18:17:07 +02:00 |
|
Laurent Destailleur
|
094719e099
|
Fix prefix
|
2019-06-02 15:53:16 +02:00 |
|
Laurent Destailleur
|
fc37c393ce
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
|
2019-06-02 12:36:48 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Laurent Destailleur
|
a20d824b97
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-02 12:30:34 +02:00 |
|
Laurent Destailleur
|
300f46cb01
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-02 12:30:25 +02:00 |
|
Laurent Destailleur
|
a1a9313487
|
Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2
Fix : only invoice active lines of a contract
|
2019-06-02 12:29:13 +02:00 |
|
Laurent Destailleur
|
4bbef9b478
|
Update card.php
|
2019-06-02 12:29:05 +02:00 |
|
Laurent Destailleur
|
7020e1ef29
|
Update card.php
|
2019-06-02 12:27:32 +02:00 |
|
Laurent Destailleur
|
db7ea5f52a
|
Merge pull request #11284 from atm-maxime/fix_buld_invoice_refclient
Fix : add refclient on bulk invoicing
|
2019-06-02 12:21:24 +02:00 |
|
Laurent Destailleur
|
2b3c5902e6
|
Merge pull request #11281 from atm-maxime/fix_warning_resource
Fix : warnings in resource module
|
2019-06-02 12:17:19 +02:00 |
|
Laurent Destailleur
|
cb927847ab
|
Update dolresource.class.php
|
2019-06-02 12:16:12 +02:00 |
|
Laurent Destailleur
|
40b212d5cc
|
Merge pull request #11280 from atm-maxime/fix_warning_page_var
Fix : avoid warning and uniformize $page var use
|
2019-06-02 12:14:47 +02:00 |
|
Laurent Destailleur
|
190cf8aba5
|
Merge pull request #11279 from atm-maxime/fix_tag_missing_right
Fix : missing rights test to display tag create link
|
2019-06-02 12:14:22 +02:00 |
|
Laurent Destailleur
|
3e9fbf0148
|
Update index.php
|
2019-06-02 12:14:07 +02:00 |
|
Laurent Destailleur
|
b40041146b
|
Merge pull request #11276 from atm-maxime/fix_db_table_prefix
Fix : remove hardcoded llx_ prefix
|
2019-06-02 12:13:33 +02:00 |
|
Maxime Kohlhaas
|
916d3ce931
|
Fix : only invoice active lines of a contract
|
2019-06-02 11:00:58 +02:00 |
|
Maxime Kohlhaas
|
d47913ed19
|
Fix : add refclient on bulk invoicing
|
2019-05-31 16:33:32 +02:00 |
|
Maxime Kohlhaas
|
0372276a7b
|
Fix : warnings in resource module
|
2019-05-31 16:04:12 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Maxime Kohlhaas
|
9ab2f44946
|
Fix : missing rights test to display tag create link
|
2019-05-31 15:14:56 +02:00 |
|
Maxime Kohlhaas
|
15fd24a511
|
Fix : remove hardcoded llx_ prefix
|
2019-05-31 12:14:51 +02:00 |
|
Laurent Destailleur
|
f2088a084f
|
Fix error management
|
2019-05-31 11:53:30 +02:00 |
|
Laurent Destailleur
|
12c1531b3b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-05-31 11:39:06 +02:00 |
|
Laurent Destailleur
|
cd75794aaa
|
FIX #11169 #11202
|
2019-05-31 11:38:54 +02:00 |
|
Laurent Destailleur
|
dedd85c8b5
|
Merge pull request #11271 from hregis/9.0_security
FIX missing llx_const encrypt
|
2019-05-31 10:56:24 +02:00 |
|
Regis Houssin
|
bdd54ae245
|
FIX missing llx_const encrypt
|
2019-05-30 11:42:28 +02:00 |
|