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 |
|
Laurent Destailleur
|
75be637b0b
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-10-03 17:50:57 +02:00 |
|
Laurent Destailleur
|
7412335217
|
Merge pull request #12031 from atm-lena/8.0_fix_missingbegin
FIX missing begin()
|
2019-10-03 17:50:35 +02:00 |
|
atm-lena
|
ae01bd8f07
|
FIX missing begin()
|
2019-10-03 17:23:16 +02:00 |
|
Laurent Destailleur
|
03614536f9
|
Merge pull request #12018 from frederic34/patch-12
backport commit for setmulticurrency
|
2019-10-03 15:54:01 +02:00 |
|
Frédéric FRANCE
|
ad3cbd17c2
|
backport commit for setmulticurrency
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
|
2019-10-02 11:12:30 +02:00 |
|
Laurent Destailleur
|
4928a999a0
|
Merge pull request #11933 from atm-gauthier/fix_conf_to_allow_changeproducttype
FIX : change product type must be allowed if we activate hidden conf
|
2019-10-01 14:41:52 +02:00 |
|
Laurent Destailleur
|
d448998762
|
Update card.php
|
2019-10-01 14:41:25 +02:00 |
|
gauthier
|
2167e7ed98
|
FIX : hidden conf to prevent from changing product_type
|
2019-10-01 09:12:51 +02:00 |
|
Laurent Destailleur
|
4f356fa412
|
Merge pull request #11859 from altatof/avoir
FIX : allow standalone credit note even if no invoice
|
2019-09-30 18:12:55 +02:00 |
|
Laurent Destailleur
|
945dd0ae89
|
Update card.php
|
2019-09-30 18:12:43 +02:00 |
|
Laurent Destailleur
|
29d941cb6e
|
Merge pull request #11918 from atm-gauthier/8.0_fix_discount_visibility_follows_invoice_sharing
FIX : If we share invoice, we need to see discount created from a deposit on each entity
|
2019-09-30 18:04:07 +02:00 |
|
Laurent Destailleur
|
5d45638248
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-09-27 14:02:23 +02:00 |
|
Laurent Destailleur
|
7f9ea2e223
|
Merge pull request #11929 from atm-florian/9.0
fix regex main.inc.php warning
|
2019-09-27 12:26:24 +02:00 |
|
Laurent Destailleur
|
de11801792
|
Merge pull request #11971 from ATM-Marc/FIX_8.0_shipping_errors
FIX: shipping card: missing user error messages when classifying closed or billed
|
2019-09-27 11:56:43 +02:00 |
|
Laurent Destailleur
|
59a099b176
|
Merge pull request #11954 from frederic34/patch-18
add missing error code in price parser
|
2019-09-27 11:35:42 +02:00 |
|