Laurent Destailleur
|
fe9ddd7649
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2019-07-25 17:50:07 +02:00 |
|
atm-josselin
|
0a1f4b7931
|
FIX : correct error in files with multiple spaces
|
2019-07-23 09:45:17 +02:00 |
|
Laurent Destailleur
|
b4e0c5ef6c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-07-22 18:51:32 +02:00 |
|
Florian Mortgat
|
b100cdb9db
|
FIX: extrafield loading bug due to assumption that an object is a third party while it may be a contact if MAIN_USE_COMPANY_NAME_OF_CONTACT is set.
|
2019-07-19 11:58:21 +02:00 |
|
Laurent Destailleur
|
4dabdfa5ac
|
Merge pull request #11483 from inoveaconseil/FIX_update_price
FIX element name in update_price
|
2019-07-13 23:30:17 +03:00 |
|
Laurent Destailleur
|
f041110a7e
|
Update commonobject.class.php
|
2019-07-13 22:29:50 +02:00 |
|
Nicolas ZABOURI
|
abd0abf115
|
FIX element name in update_price
|
2019-07-10 18:36:12 +02:00 |
|
Laurent Destailleur
|
9d50c67208
|
FIX option EXPORT_LABEL_FOR_SELECT to restore compatibility in export
|
2019-07-02 18:06:51 +02:00 |
|
Laurent Destailleur
|
ae1ad80994
|
Fix count
|
2019-06-24 16:32:42 +02:00 |
|
Laurent Destailleur
|
b98874848f
|
Fix backport 9.0
|
2019-06-24 16:12:54 +02:00 |
|
Laurent Destailleur
|
3c4956838e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/massactions_pre.tpl.php
|
2019-06-24 15:44:44 +02:00 |
|
Laurent Destailleur
|
04606ec6a3
|
Merge pull request #11384 from ATM-Consulting/7.0_fix_mass_send_mail
FIX mass send mail
|
2019-06-24 15:34:06 +02:00 |
|
John Botella
|
ec7ebe9f39
|
redo backported fix and update adherent substitution methode
|
2019-06-21 15:32:38 +02:00 |
|
John Botella
|
200b66d11f
|
Remove a backported fix because failling at init test
|
2019-06-21 14:52:12 +02:00 |
|
Laurent Destailleur
|
70c950bd7c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/modules/modAdherent.class.php
|
2019-06-21 11:26:25 +02:00 |
|
Laurent Destailleur
|
9093be2f0a
|
FIX Add missing end date of subscription in export
|
2019-06-21 11:23:49 +02:00 |
|
John Botella
|
b21006614c
|
Fix substitutions null
|
2019-06-20 12:00:44 +02:00 |
|
John Botella
|
6a68c8cd99
|
Fix display option email per participient
|
2019-06-20 11:09:37 +02:00 |
|
John Botella
|
9305403bea
|
Fix duplicate pdf in mass sendmail
|
2019-06-20 10:32:32 +02:00 |
|
John Botella
|
252bd6d9ba
|
FIX condition
|
2019-06-20 09:48:08 +02:00 |
|
John Botella
|
7c29fb614c
|
Fix replacement and vars names
|
2019-06-20 09:21:35 +02:00 |
|
John Botella
|
31a53b72ae
|
FIX var name
|
2019-06-19 16:55:45 +02:00 |
|
Laurent Destailleur
|
20e00ca290
|
FIX if last char of customercode is accent making the truncate of first
chars wrong.
|
2019-06-18 19:41:16 +02:00 |
|
Laurent Destailleur
|
3e6b7208cc
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-13 12:12:37 +02:00 |
|
Laurent Destailleur
|
319bc7ec8a
|
Fix syntax error
|
2019-06-13 12:12:20 +02:00 |
|
Laurent Destailleur
|
b6f477fc83
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-13 12:07:24 +02:00 |
|
Laurent Destailleur
|
1318e26cda
|
Merge pull request #11298 from hregis/7.0_price
FIX missing compatibility with multicompany transverse mode
|
2019-06-13 10:01:05 +02:00 |
|
Laurent Destailleur
|
4cbfb67d63
|
Update html.formother.class.php
|
2019-06-13 09:59:10 +02:00 |
|
Laurent Destailleur
|
4f5f03b893
|
Merge pull request #11326 from atm-greg/FIX_massaction_presend
Fix massaction presend
|
2019-06-12 12:37:03 +02:00 |
|
Laurent Destailleur
|
0bf7512f28
|
Update actions_massactions.inc.php
|
2019-06-12 12:33:31 +02:00 |
|
atm-greg
|
47746fd17d
|
fix template type
|
2019-06-12 12:30:49 +02:00 |
|
atm-greg
|
9ba102b6b9
|
bad object used
|
2019-06-12 12:08:16 +02:00 |
|
atm-greg
|
25031e534d
|
fix massaction presend
|
2019-06-12 12:05:02 +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 |
|
Regis Houssin
|
5726b40a10
|
FIX try to use WHERE EXISTS instead DISTINCT
|
2019-06-03 17:26:03 +02:00 |
|
Regis Houssin
|
7fd1051efc
|
FIX missing compatibility with multicompany transverse mode
Conflicts:
htdocs/core/class/html.formother.class.php
|
2019-06-03 17:22:15 +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 |
|
Maxime Kohlhaas
|
15fd24a511
|
Fix : remove hardcoded llx_ prefix
|
2019-05-31 12:14:51 +02:00 |
|
Laurent Destailleur
|
912e29a746
|
FIX #11244
|
2019-05-29 11:06:01 +02:00 |
|
Laurent Destailleur
|
3c05cfe690
|
Fix useless test
|
2019-05-29 10:50:33 +02:00 |
|
Laurent Destailleur
|
a491de01b3
|
Merge pull request #11244 from altatof/8.0
FIX : do not include tpl from disabled modules
|
2019-05-29 10:35:39 +02:00 |
|
Laurent Destailleur
|
7db643fff0
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-05-27 19:23:09 +02:00 |
|
Laurent Destailleur
|
93c395fe10
|
FIX confirmation of mass email sending + option MAILING_NO_USING_PHPMAIL
|
2019-05-27 19:22:51 +02:00 |
|
atm-ph
|
c79b9b9704
|
Fix create bills on mass action does not retrieve the original currency code
|
2019-05-27 11:18:29 +02:00 |
|
Christophe Battarel
|
83d883c36a
|
finally eldy is always right
|
2019-05-24 15:14:34 +02:00 |
|
Christophe Battarel
|
4863ddcb00
|
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0
|
2019-05-24 15:13:23 +02:00 |
|
Christophe Battarel
|
545cdd0762
|
test include return on FALSE
|
2019-05-24 12:54:24 +02:00 |
|
Christophe Battarel
|
abc7c2f0f8
|
test include return on TRUE
|
2019-05-24 12:33:40 +02:00 |
|
Christophe Battarel
|
aaaad71347
|
FIX : do not include disabled modules tpl
|
2019-05-24 12:10:58 +02:00 |
|