Commit Graph

73137 Commits

Author SHA1 Message Date
Alexandre SPANGARO
0497c399d7 Missing language key 2019-11-13 14:59:07 +01:00
Laurent Destailleur
f8e8d15606 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-12 10:19:01 +01:00
Laurent Destailleur
5f7b09c97f
Merge pull request #12406 from atm-gauthier/8.0_useless_limit_on_select_conf
FIX : limit 20 prevent to see all products/services
2019-11-12 09:49:00 +01:00
gauthier
e2680f7637 FIX : limit 20 prevent to see all products/services 2019-11-12 09:42:27 +01:00
Laurent Destailleur
2b7a813e98
Merge pull request #12267 from ATM-Marc/FIX_8.0_trigger_closedir
FIX: triggers: directories read with opendir() never closed
2019-11-02 13:06:54 +01:00
Marc de Lima Lucio
85cef09e83 FIX: triggers: directories read with opendir() never closed 2019-10-30 14:46:46 +01:00
Laurent Destailleur
c2638f4148
Merge pull request #12238 from atm-maxime/fix_fetch_contact
Fix missing contact fetch on card
2019-10-30 03:04:01 +01:00
Laurent Destailleur
b7e81c5396
Merge pull request #12247 from frederic34/patch-21
HOLIDAY_APPROVEInDolibarr
2019-10-30 02:44:50 +01:00
Laurent Destailleur
149d63757f Space 2019-10-29 11:43:56 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
	htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
Laurent Destailleur
21d15c3bcb FIX Set unpaid of expense report 2019-10-29 11:35:33 +01:00
Laurent Destailleur
5e06fe0712 FIX Avoid fatal error when creating thumb from PDF 2019-10-29 11:11:13 +01:00
Frédéric FRANCE
30d416f8c0
Update agenda.lang 2019-10-28 20:16:27 +01:00
Maxime Kohlhaas
fced9ec690 Fix missing contact fetch on card 2019-10-27 12:04:01 +01:00
Juanjo Menent
7e9d6dc153 Fix With pagination it is possible that the searched product does not appear if there are many open supplier orders 2019-10-24 10:58:29 +02:00
Laurent Destailleur
40135e043e
Merge pull request #12166 from frederic34/patch-13
fix cant add bookmark with csrf active
2019-10-20 12:43:39 +02:00
Laurent Destailleur
b5390bfb3c
Merge pull request #12167 from frederic34/patch-14
Update main.lang
2019-10-20 12:41:06 +02:00
Laurent Destailleur
ce1b443212 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-18 14:26:09 +02:00
Frédéric FRANCE
f9c0e63f16
Update main.lang 2019-10-17 22:59:52 +02:00
Frédéric FRANCE
aeafdae34c
Update main.lang 2019-10-17 22:58:47 +02:00
Frédéric FRANCE
d442134a51
fix cant add bookmark with csrf active 2019-10-17 21:15:34 +02:00
Laurent Destailleur
373d6d60e7 Add a message 2019-10-17 21:13:18 +02:00
Laurent Destailleur
9cd2406d50
Merge pull request #12156 from ATM-Marc/FIX_8.0_replenish_resql
FIX: stock replenish: fetching and freeing non existing SQL result set
2019-10-17 17:40:24 +02:00
Marc de Lima Lucio
d79340a632 FIX: stock replenish: fetching and freeing non existing SQL result set 2019-10-17 09:55:02 +02:00
Laurent Destailleur
93aa7e208d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:19 +02:00
Laurent Destailleur
b47ebcca2b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:10 +02:00
Laurent Destailleur
cb29133a3d
Merge pull request #12142 from frederic34/patch-18
fix propal list for external user
2019-10-16 13:22:29 +02:00
Frédéric FRANCE
6a8e8907ef
Update list.php 2019-10-15 17:55:07 +02:00
Laurent Destailleur
6662b00575 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:40 +02:00
Laurent Destailleur
2d1bc90e57 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:06 +02:00
Laurent Destailleur
94aa98beed
Merge pull request #12131 from frederic34/patch-21
FIX Sort on total without tax on supplier invoices list
2019-10-14 21:25:13 +02:00
Frédéric FRANCE
45b3d623bb
Update list.php 2019-10-14 20:30:31 +02:00
Laurent Destailleur
a35173973c
Merge pull request #12102 from frederic34/patch-13
fix translation for showemailing
2019-10-12 03:26:46 +02:00
Frédéric FRANCE
c3e8aec07c
fix translation for showemailing
in lang files, it's ShowEMailing not ShowEmailing
2019-10-11 23:54:05 +02:00
Laurent Destailleur
7ea0af4067 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:38 +02:00
Laurent Destailleur
2a07ecf659 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:30 +02:00
Laurent Destailleur
a6fd864145
Merge pull request #12075 from frederic34/patch-13
doxygen
2019-10-11 15:52:11 +02:00
Frédéric FRANCE
0c8331b6d7
doxygen 2019-10-09 18:47:25 +02:00
Laurent Destailleur
b847eb1b7e
Merge pull request #12056 from atm-florianm/FIX_7.0_email_addresses_in_email_sending_error_message
FIX 7.0: addresses not displayed in e-mail sending error messages
2019-10-07 20:25:01 +02:00
Florian Mortgat
2aee62ea28 FIX: $from and $sendto variables are unescaped in the sending error message
This causes addresses like Tom <tom@examp.le> not to be shown in the message.
2019-10-07 17:32:52 +02:00
Laurent Destailleur
bb84e4a236
Merge pull request #12037 from frederic34/patch-14
Fix list of expense report list for user when he has extrafields
2019-10-07 13:10:02 +02:00
Laurent Destailleur
611b045676
Merge pull request #12053 from atm-lena/9.0_fix_link_fetch
FIX : missing "$this->id" in "fetch" function
2019-10-07 12:38:05 +02:00
Laurent Destailleur
55508e25ec Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-07 12:27:06 +02:00
atm-lena
8c024b3786 FIX : missing "$this->id" in "fetch" function 2019-10-07 11:26:10 +02:00
Laurent Destailleur
3d20766392
Merge pull request #12047 from frederic34/patch-15
translation for holidays actioncomm
2019-10-07 10:23:29 +02:00
Frédéric FRANCE
37f6aa3395
Update list.php 2019-10-06 15:52:33 +02:00
Frédéric FRANCE
52da21912b
Update agenda.lang 2019-10-06 13:21:04 +02:00
Frédéric FRANCE
21dcc549fa
translation for holidays actioncomm 2019-10-06 10:09:06 +02:00
Frédéric FRANCE
55410a55ef
Update list.php 2019-10-04 00:45:57 +02:00
Laurent Destailleur
d9aa816197 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:52:06 +02:00