[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] c5307e: Fix option MAILING_LIMIT_SEND
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] c5307e: Fix option MAILING_LIMIT_SENDBYWEB |
|
Date: |
Wed, 31 Jan 2018 11:25:40 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: c5307e5cac92c3729e006395e4726e3d2d480e7a
https://github.com/Dolibarr/dolibarr/commit/c5307e5cac92c3729e006395e4726e3d2d480e7a
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-26 (Fri, 26 Jan 2018)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/langs/en_US/mails.lang
Log Message:
-----------
Fix option MAILING_LIMIT_SENDBYWEB
Commit: ba0a96c882779355bab007a2004920fd38cc4d70
https://github.com/Dolibarr/dolibarr/commit/ba0a96c882779355bab007a2004920fd38cc4d70
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-26 (Fri, 26 Jan 2018)
Changed paths:
M htdocs/comm/mailing/cibles.php
Log Message:
-----------
Missing param limit
Commit: 13adf06ae428e798831d89a50ac479864262e2ef
https://github.com/Dolibarr/dolibarr/commit/13adf06ae428e798831d89a50ac479864262e2ef
Author: Juanjo Menent <address@hidden>
Date: 2018-01-27 (Sat, 27 Jan 2018)
Changed paths:
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/donations.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/modulebuilder.lang
M htdocs/langs/es_ES/multicurrency.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/printing.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/es_ES/website.lang
M htdocs/langs/es_ES/withdrawals.lang
Log Message:
-----------
Trad: more understandable extrafield translation to the end user
Trad: fix english words
Trad: more accurate accounting translation
Commit: bee64962fe95ede645af09f60650a1c68231ded6
https://github.com/Dolibarr/dolibarr/commit/bee64962fe95ede645af09f60650a1c68231ded6
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-27 (Sat, 27 Jan 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/index.php
Log Message:
-----------
Fix css
Commit: a63930860133ba904f23595f7f0e007a27c02f30
https://github.com/Dolibarr/dolibarr/commit/a63930860133ba904f23595f7f0e007a27c02f30
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-27 (Sat, 27 Jan 2018)
Changed paths:
M htdocs/admin/dict.php
M htdocs/blockedlog/admin/blockedlog_list.php
Log Message:
-----------
Fix css
Commit: 7dcb3bf6fcaa93a107335ce489b7ae4b9a7a2fd1
https://github.com/Dolibarr/dolibarr/commit/7dcb3bf6fcaa93a107335ce489b7ae4b9a7a2fd1
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-27 (Sat, 27 Jan 2018)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix var not initialized
Commit: 65c71172405f7fc0c29646dbe2de2ac6b7581f61
https://github.com/Dolibarr/dolibarr/commit/65c71172405f7fc0c29646dbe2de2ac6b7581f61
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-27 (Sat, 27 Jan 2018)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix var serialized twice
Commit: a87ecc14eca0d50884b05df68f5d5bcfae56541a
https://github.com/Dolibarr/dolibarr/commit/a87ecc14eca0d50884b05df68f5d5bcfae56541a
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-28 (Sun, 28 Jan 2018)
Changed paths:
M htdocs/install/step5.php
Log Message:
-----------
Fix install.lock not always saved
Commit: 857c03eeb94d7315d7213a30911df58f667dd06d
https://github.com/Dolibarr/dolibarr/commit/857c03eeb94d7315d7213a30911df58f667dd06d
Author: De Coninck Laurent <address@hidden>
Date: 2018-01-28 (Sun, 28 Jan 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/list.php
Log Message:
-----------
fix issue on Big book
Commit: c41374220e71f22cda43b4f019cb9d1cbdc1121f
https://github.com/Dolibarr/dolibarr/commit/c41374220e71f22cda43b4f019cb9d1cbdc1121f
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/public/paybox/newpayment.php
M htdocs/public/payment/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/stripe/newpayment.php
Log Message:
-----------
Fix css
Commit: 716d44a610a221ce15332c48a5f170a3d00d0ddc
https://github.com/Dolibarr/dolibarr/commit/716d44a610a221ce15332c48a5f170a3d00d0ddc
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/public/paybox/newpayment.php
M htdocs/public/payment/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/stripe/newpayment.php
Log Message:
-----------
Fix price in member public form
Commit: 3c4ed55179c8b42bdf09e756cbc03dfca84112c2
https://github.com/Dolibarr/dolibarr/commit/3c4ed55179c8b42bdf09e756cbc03dfca84112c2
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/public/paybox/newpayment.php
M htdocs/public/payment/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/stripe/newpayment.php
Log Message:
-----------
Fix css
Commit: 424e8a313938c0f85ecf2b3068e8fb92a109e4c8
https://github.com/Dolibarr/dolibarr/commit/424e8a313938c0f85ecf2b3068e8fb92a109e4c8
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/public/paybox/newpayment.php
M htdocs/public/payment/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/stripe/newpayment.php
Log Message:
-----------
Fix price format in payment pages
Commit: 0a11d52d5357383ff3589f7b8dccbe4241f5183f
https://github.com/Dolibarr/dolibarr/commit/0a11d52d5357383ff3589f7b8dccbe4241f5183f
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/mailing.class.php
Log Message:
-----------
Fix info on email sent
Commit: c67e57836e337b201f4d5df144865ea9dfe70417
https://github.com/Dolibarr/dolibarr/commit/c67e57836e337b201f4d5df144865ea9dfe70417
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
Log Message:
-----------
Code comment
Commit: 8ae25b3c657978b6c01b61bc0f3c82abddedfbbf
https://github.com/Dolibarr/dolibarr/commit/8ae25b3c657978b6c01b61bc0f3c82abddedfbbf
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/compta/facture/card.php
Log Message:
-----------
Fix the FACTURE_ENABLE_NEGATIVE was useless without
FACTURE_ENABLE_NEGATIVE_LINES
Commit: 4eb7d7a3329428040c1495d3cb9b8976fdaa7568
https://github.com/Dolibarr/dolibarr/commit/4eb7d7a3329428040c1495d3cb9b8976fdaa7568
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/core/class/html.formprojet.class.php
M
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
M htdocs/langs/en_US/blockedlog.lang
Log Message:
-----------
Debug blockedlog with various payments
Commit: 491e64db0657bc521f048cea40c971db79b3210b
https://github.com/Dolibarr/dolibarr/commit/491e64db0657bc521f048cea40c971db79b3210b
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/langs/en_US/blockedlog.lang
Log Message:
-----------
Fix various payments
Commit: 1f30f9b179bc061bf57f8c1c8b3321f85e0dc242
https://github.com/Dolibarr/dolibarr/commit/1f30f9b179bc061bf57f8c1c8b3321f85e0dc242
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/list.php
Log Message:
-----------
Update list.php
Commit: 8cd54d6630939739263f0c09e2fc9ee2391fcb0b
https://github.com/Dolibarr/dolibarr/commit/8cd54d6630939739263f0c09e2fc9ee2391fcb0b
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/list.php
Log Message:
-----------
Merge pull request #8108 from laudeco/hotfix/invoice_book
fix issue on Big book
Commit: 7bb46e65d77d9a5eb42da5f037bdb517391b500d
https://github.com/Dolibarr/dolibarr/commit/7bb46e65d77d9a5eb42da5f037bdb517391b500d
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/donations.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/modulebuilder.lang
M htdocs/langs/es_ES/multicurrency.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/printing.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/es_ES/website.lang
M htdocs/langs/es_ES/withdrawals.lang
Log Message:
-----------
Merge pull request #8103 from simnandez/7.0
Trad: more understandable extrafield translation to the end user
Commit: e208e5b8a765f741c2030b8806a4477605854fb7
https://github.com/Dolibarr/dolibarr/commit/e208e5b8a765f741c2030b8806a4477605854fb7
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/compta/tva/class/tva.class.php
M htdocs/compta/tva/reglement.php
Log Message:
-----------
Fix look and feel v7
Commit: cc0048474ef1c67608346ebd22c5e3c46bbca794
https://github.com/Dolibarr/dolibarr/commit/cc0048474ef1c67608346ebd22c5e3c46bbca794
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-29 (Mon, 29 Jan 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/list.php
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/donations.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/modulebuilder.lang
M htdocs/langs/es_ES/multicurrency.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/printing.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/es_ES/website.lang
M htdocs/langs/es_ES/withdrawals.lang
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: acf92da12ddffe8f0f2b84656676a2c80c8ac35a
https://github.com/Dolibarr/dolibarr/commit/acf92da12ddffe8f0f2b84656676a2c80c8ac35a
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M htdocs/public/members/new.php
M htdocs/public/paybox/newpayment.php
M htdocs/public/payment/newpayment.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/stripe/newpayment.php
Log Message:
-----------
Fix option MEMBER_NEWFORM_AMOUNT
Commit: cd91a81456481477399602efc90d43379d65a621
https://github.com/Dolibarr/dolibarr/commit/cd91a81456481477399602efc90d43379d65a621
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
CSS
Commit: 06f2382e392ecf6cbf0cb4c62aa4f23447a92f07
https://github.com/Dolibarr/dolibarr/commit/06f2382e392ecf6cbf0cb4c62aa4f23447a92f07
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M htdocs/core/lib/company.lib.php
Log Message:
-----------
Fix compatibility with old actioncomm record
Commit: be874f0b1d2b9ffd4c1f3d6801a200e9a9ad410f
https://github.com/Dolibarr/dolibarr/commit/be874f0b1d2b9ffd4c1f3d6801a200e9a9ad410f
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M htdocs/public/paybox/paymentok.php
M htdocs/public/payment/paymentok.php
M htdocs/public/paypal/paymentok.php
M htdocs/public/stripe/paymentok.php
Log Message:
-----------
Fix fulltag
Commit: d744a1af0d3f33f782ecefeabd7d2bf386e25192
https://github.com/Dolibarr/dolibarr/commit/d744a1af0d3f33f782ecefeabd7d2bf386e25192
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M htdocs/adherents/agenda.php
Log Message:
-----------
Fix look and feel v7
Commit: 0d90ab0c6cee398808b133e9a902549d4c099444
https://github.com/Dolibarr/dolibarr/commit/0d90ab0c6cee398808b133e9a902549d4c099444
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M htdocs/core/lib/functions2.lib.php
Log Message:
-----------
Fix when counter is corrupted in database
Commit: d6317a26d213c5a0ab14d7e9bff8b4a64ec75a47
https://github.com/Dolibarr/dolibarr/commit/d6317a26d213c5a0ab14d7e9bff8b4a64ec75a47
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M ChangeLog
M htdocs/categories/class/categorie.class.php
M htdocs/comm/index.php
M htdocs/comm/prospect/index.php
M htdocs/contact/class/contact.class.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/modulebuilder/template/mymoduleindex.php
M htdocs/societe/class/client.class.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix for multicompany
Commit: 89dc2080729f9ad0fc916918a7f06e792bd469c6
https://github.com/Dolibarr/dolibarr/commit/89dc2080729f9ad0fc916918a7f06e792bd469c6
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-30 (Tue, 30 Jan 2018)
Changed paths:
M htdocs/commande/class/api_orders.class.php
M htdocs/commande/class/commande.class.php
Log Message:
-----------
Fix fk_account not into update
Commit: e9f8c7ba015828b857d9b95cbdbccf5681671810
https://github.com/Dolibarr/dolibarr/commit/e9f8c7ba015828b857d9b95cbdbccf5681671810
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix edit of extrafields "link" corrupts the data definition
Commit: de0a8ba71fc2ed91d31c81b05b3684d68305f3d8
https://github.com/Dolibarr/dolibarr/commit/de0a8ba71fc2ed91d31c81b05b3684d68305f3d8
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M htdocs/comm/card.php
M htdocs/contact/class/contact.class.php
M htdocs/core/actions_changeselectedfields.inc.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
M htdocs/fourn/card.php
M htdocs/societe/contact.php
Log Message:
-----------
Fix extrafields
Commit: a6f12eebe33938c8042c002a050e291d70e296d9
https://github.com/Dolibarr/dolibarr/commit/a6f12eebe33938c8042c002a050e291d70e296d9
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M ChangeLog
Log Message:
-----------
Fix changelog
Commit: 14ecdce650c75b12612f3af706792766046cca8d
https://github.com/Dolibarr/dolibarr/commit/14ecdce650c75b12612f3af706792766046cca8d
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/societe/card.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/note.php
Log Message:
-----------
Fix merge of thirdparties (pb when merging codes and error management)
Commit: b49a7e245c1b22c2367875735b933d83693f2426
https://github.com/Dolibarr/dolibarr/commit/b49a7e245c1b22c2367875735b933d83693f2426
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Add hidden option INVOICE_NO_PAYMENT_DETAILS required by some countries
Commit: 7f9d6a5458dec271b7ebf7fdd07fc6c9d239d685
https://github.com/Dolibarr/dolibarr/commit/7f9d6a5458dec271b7ebf7fdd07fc6c9d239d685
Author: Laurent Destailleur <address@hidden>
Date: 2018-01-31 (Wed, 31 Jan 2018)
Changed paths:
M ChangeLog
M htdocs/accountancy/bookkeeping/list.php
M htdocs/adherents/agenda.php
M htdocs/blockedlog/admin/blockedlog_list.php
M htdocs/blockedlog/class/blockedlog.class.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/mailing/card.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/mailing/class/mailing.class.php
M htdocs/comm/prospect/index.php
M htdocs/commande/class/api_orders.class.php
M htdocs/commande/class/commande.class.php
M htdocs/compta/bank/class/paymentvarious.class.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/bank/various_payment/index.php
M htdocs/compta/facture/card.php
M htdocs/compta/tva/class/tva.class.php
M htdocs/compta/tva/reglement.php
M htdocs/contact/class/contact.class.php
M htdocs/core/actions_changeselectedfields.inc.php
M htdocs/core/boxes/box_produits.php
M htdocs/core/boxes/box_produits_alerte_stock.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/class/html.formprojet.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
M
htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
M htdocs/fichinter/class/fichinter.class.php
M htdocs/fourn/card.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/blockedlog.lang
M htdocs/langs/en_US/mails.lang
M htdocs/langs/es_ES/accountancy.lang
M htdocs/langs/es_ES/admin.lang
M htdocs/langs/es_ES/bills.lang
M htdocs/langs/es_ES/categories.lang
M htdocs/langs/es_ES/companies.lang
M htdocs/langs/es_ES/compta.lang
M htdocs/langs/es_ES/donations.lang
M htdocs/langs/es_ES/languages.lang
M htdocs/langs/es_ES/main.lang
M htdocs/langs/es_ES/modulebuilder.lang
M htdocs/langs/es_ES/multicurrency.lang
M htdocs/langs/es_ES/other.lang
M htdocs/langs/es_ES/printing.lang
M htdocs/langs/es_ES/products.lang
M htdocs/langs/es_ES/users.lang
M htdocs/langs/es_ES/website.lang
M htdocs/langs/es_ES/withdrawals.lang
M htdocs/modulebuilder/template/mymoduleindex.php
M htdocs/public/members/new.php
M htdocs/public/paybox/newpayment.php
M htdocs/public/paybox/paymentok.php
M htdocs/public/payment/newpayment.php
M htdocs/public/payment/paymentok.php
M htdocs/public/paypal/newpayment.php
M htdocs/public/paypal/paymentok.php
M htdocs/public/stripe/newpayment.php
M htdocs/public/stripe/paymentok.php
M htdocs/societe/card.php
M htdocs/societe/class/api_thirdparties.class.php
M htdocs/societe/class/client.class.php
M htdocs/societe/class/societe.class.php
M htdocs/societe/contact.php
M htdocs/societe/note.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/e46e66b1ed37...7f9d6a5458de