[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 59220c: FIX : Select first mail model
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 59220c: FIX : Select first mail model by default |
Date: |
Sat, 01 Dec 2018 10:23:12 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 59220c05e4070efc304a03bde1d61277eab66b49
https://github.com/Dolibarr/dolibarr/commit/59220c05e4070efc304a03bde1d61277eab66b49
Author: ATM-Nicolas <address@hidden>
Date: 2018-07-05 (Thu, 05 Jul 2018)
Changed paths:
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
FIX : Select first mail model by default
Commit: c13cc5d697cdc6d44033092555292d4b6131ae21
https://github.com/Dolibarr/dolibarr/commit/c13cc5d697cdc6d44033092555292d4b6131ae21
Author: Marc de Lima Lucio <address@hidden>
Date: 2018-11-28 (Wed, 28 Nov 2018)
Changed paths:
M htdocs/core/class/html.formactions.class.php
Log Message:
-----------
FIX: form actions: select_type_actions could be too small + bad init
Commit: d8ab614efb7401d2ecca88d96e573f8afeec75ce
https://github.com/Dolibarr/dolibarr/commit/d8ab614efb7401d2ecca88d96e573f8afeec75ce
Author: Laurent Destailleur <address@hidden>
Date: 2018-11-29 (Thu, 29 Nov 2018)
Changed paths:
M htdocs/core/class/html.formactions.class.php
Log Message:
-----------
Merge pull request #10088 from ATM-Marc/FIX_7.0_select_type_actions
FIX: form actions: select_type_actions could be too small + bad $db init
Commit: 5dcb3d2a1fe103515c7ad7ccc5ef045a653b0199
https://github.com/Dolibarr/dolibarr/commit/5dcb3d2a1fe103515c7ad7ccc5ef045a653b0199
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modResource.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
Log Message:
-----------
Fix extrafields in import tool
Commit: 758546148624ddca7ba8e3d294bc4e1122f752d2
https://github.com/Dolibarr/dolibarr/commit/758546148624ddca7ba8e3d294bc4e1122f752d2
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/install/step1.php
Log Message:
-----------
Fix #9070
Commit: e8a02a971d4a33b4fa0d8c7a694c175834c8c6ad
https://github.com/Dolibarr/dolibarr/commit/e8a02a971d4a33b4fa0d8c7a694c175834c8c6ad
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/fourn/class/paiementfourn.class.php
Log Message:
-----------
Fix #9074
Commit: 7a182c788000104f837c8c4bff8f26973c4960dd
https://github.com/Dolibarr/dolibarr/commit/7a182c788000104f837c8c4bff8f26973c4960dd
Author: florian HENRY <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/comm/action/index.php
Log Message:
-----------
fix #10069
Commit: 6d8f3aedc33e0f688187be2f93428e4f9a2c0936
https://github.com/Dolibarr/dolibarr/commit/6d8f3aedc33e0f688187be2f93428e4f9a2c0936
Author: Juanjo Menent <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modResource.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
Log Message:
-----------
Merge pull request #10107 from atm-maxime/fix_import_extrafields
Fix extrafields in import tool
Commit: 859d6c4401986f23e59bbaf0891d2f35da93b44c
https://github.com/Dolibarr/dolibarr/commit/859d6c4401986f23e59bbaf0891d2f35da93b44c
Author: Juanjo Menent <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/install/step1.php
Log Message:
-----------
Merge pull request #10109 from atm-maxime/fix_dupl_code
Fix #9070
Commit: d1df592c7ec44e8714ade6b56f302e65e8d206cc
https://github.com/Dolibarr/dolibarr/commit/d1df592c7ec44e8714ade6b56f302e65e8d206cc
Author: Juanjo Menent <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/fourn/class/paiementfourn.class.php
Log Message:
-----------
Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen
Fix #9074
Commit: ace14434e968b36b4a2ac61ba0293bae3c5d914f
https://github.com/Dolibarr/dolibarr/commit/ace14434e968b36b4a2ac61ba0293bae3c5d914f
Author: Juanjo Menent <address@hidden>
Date: 2018-11-30 (Fri, 30 Nov 2018)
Changed paths:
M htdocs/comm/action/index.php
Log Message:
-----------
Merge pull request #10111 from atm-florian/8.0
fix #10069
Commit: 335327827d8001278a32bf441fed7ac9c46b14cb
https://github.com/Dolibarr/dolibarr/commit/335327827d8001278a32bf441fed7ac9c46b14cb
Author: Frédéric FRANCE <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Update 6.0.0-7.0.0.sql
Commit: 38059ed60d8926a3f7f9caad3e0fae05a84f5e7b
https://github.com/Dolibarr/dolibarr/commit/38059ed60d8926a3f7f9caad3e0fae05a84f5e7b
Author: florian HENRY <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/balance.php
Log Message:
-----------
fix #10006
Commit: cddb6e0c47b7c19678d7c1ad2a69ef1f216ec5d4
https://github.com/Dolibarr/dolibarr/commit/cddb6e0c47b7c19678d7c1ad2a69ef1f216ec5d4
Author: florian HENRY <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Log Message:
-----------
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0
Commit: 2b5bf0e2dd86da02064bb9780b9e47b537415e9d
https://github.com/Dolibarr/dolibarr/commit/2b5bf0e2dd86da02064bb9780b9e47b537415e9d
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
Log Message:
-----------
Fix pdf strato for contract with multipage
Commit: 163f67d60074a31174e198f02ab59ba0f68902f7
https://github.com/Dolibarr/dolibarr/commit/163f67d60074a31174e198f02ab59ba0f68902f7
Author: Juanjo Menent <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/balance.php
Log Message:
-----------
Merge pull request #10115 from atm-florian/8.0
fix #10006
Commit: 1c04c2b5f44a0c76cc1dc9ad3dc018f9fdbea8c1
https://github.com/Dolibarr/dolibarr/commit/1c04c2b5f44a0c76cc1dc9ad3dc018f9fdbea8c1
Author: Juanjo Menent <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Fix #10097
Commit: 6104d16b08a44cd086dc8c2a7d684271ae6a7920
https://github.com/Dolibarr/dolibarr/commit/6104d16b08a44cd086dc8c2a7d684271ae6a7920
Author: Juanjo Menent <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
Log Message:
-----------
Merge pull request #10117 from atm-maxime/fix_pdf_contract
Fix pdf strato for contract with multipage
Commit: 60610ca49d633786fd5b60c47482e7f9f1c6d115
https://github.com/Dolibarr/dolibarr/commit/60610ca49d633786fd5b60c47482e7f9f1c6d115
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #10119 from simnandez/8.0
Fix #10097
Commit: 305ab85f5da3a8d397edeea80184a123e9804c4a
https://github.com/Dolibarr/dolibarr/commit/305ab85f5da3a8d397edeea80184a123e9804c4a
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge pull request #10114 from frederic34/patch-17
Update 6.0.0-7.0.0.sql #8723
Commit: 7d4553179db43aeccecd7a3139f50f5ad42061df
https://github.com/Dolibarr/dolibarr/commit/7d4553179db43aeccecd7a3139f50f5ad42061df
Author: Juanjo Menent <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/public/payment/newpayment.php
Log Message:
-----------
Fix #9929
Commit: 8964ec7ea179d2f9f5a109529220b26efac10b07
https://github.com/Dolibarr/dolibarr/commit/8964ec7ea179d2f9f5a109529220b26efac10b07
Author: Inovea Conseil <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Fix #9572
Fix #9572
Commit: 3b4ee295f3db38b4db691f54f94192c3746fddc3
https://github.com/Dolibarr/dolibarr/commit/3b4ee295f3db38b4db691f54f94192c3746fddc3
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/public/payment/newpayment.php
Log Message:
-----------
Merge pull request #10129 from simnandez/8.0
Fix #9929
Commit: 0ba5fda3daa0ed480acc9b8ed26a9a6ac83ca48d
https://github.com/Dolibarr/dolibarr/commit/0ba5fda3daa0ed480acc9b8ed26a9a6ac83ca48d
Author: Inovea Conseil <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Update price.php
Commit: 61322b9ce27a766c71ce3b7267c4b39dae0e31c4
https://github.com/Dolibarr/dolibarr/commit/61322b9ce27a766c71ce3b7267c4b39dae0e31c4
Author: Frédéric FRANCE <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
devcamp 2018 fix #9642
Commit: 508cb459eb5903282f56a7904584d1c29af2ed0a
https://github.com/Dolibarr/dolibarr/commit/508cb459eb5903282f56a7904584d1c29af2ed0a
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/expensereport/card.php
Log Message:
-----------
Merge pull request #10134 from frederic34/patch-18
devcamp 2018 fix #9642
Commit: 3ea69cb1f162748a880bf61822611411fba3a40a
https://github.com/Dolibarr/dolibarr/commit/3ea69cb1f162748a880bf61822611411fba3a40a
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/product/price.php
Log Message:
-----------
Merge pull request #10130 from inoveaconseil/patch-3
Fix #9572
Commit: 589511f38cad5838b5c471ebad79afcc9f9255e6
https://github.com/Dolibarr/dolibarr/commit/589511f38cad5838b5c471ebad79afcc9f9255e6
Author: florian HENRY <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/install/doctemplates/shipment/template_shipment.odt
Log Message:
-----------
fix #9999
Commit: c320dcd161307e7f4c8934cb7fb22252b4ad6ea9
https://github.com/Dolibarr/dolibarr/commit/c320dcd161307e7f4c8934cb7fb22252b4ad6ea9
Author: florian HENRY <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/expensereport/card.php
M htdocs/public/payment/newpayment.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into
8.0_fix9999
Commit: bbf3b3baacdcf2cc1f71a56337a0fff9c78f7d8e
https://github.com/Dolibarr/dolibarr/commit/bbf3b3baacdcf2cc1f71a56337a0fff9c78f7d8e
Author: Philippe GRAND <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/ticket/class/actions_ticket.class.php
Log Message:
-----------
fix :#9967
Commit: 3d09b05338ebe0668916b5a09ea16ddbc70e94a0
https://github.com/Dolibarr/dolibarr/commit/3d09b05338ebe0668916b5a09ea16ddbc70e94a0
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/install/doctemplates/shipment/template_shipment.odt
Log Message:
-----------
Merge pull request #10135 from atm-florian/8.0_fix9999
fix #9999
Commit: 748dd12e4dc94dc5c60a40b6feb5d03b601d3766
https://github.com/Dolibarr/dolibarr/commit/748dd12e4dc94dc5c60a40b6feb5d03b601d3766
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/class/html.formmail.class.php
Log Message:
-----------
Merge pull request #9056 from ATM-Nicolas/fix_default_preselected_mail_model
FIX : Select first mail model by default
Commit: e4bc9f8f87bb6191c4875eeaf274b381400c797e
https://github.com/Dolibarr/dolibarr/commit/e4bc9f8f87bb6191c4875eeaf274b381400c797e
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/ticket/class/actions_ticket.class.php
Log Message:
-----------
Merge pull request #10136 from grandoc/8.0
fix :#9967
Commit: 18281d9d439e5037ff7ebd7f39566cff147d21bd
https://github.com/Dolibarr/dolibarr/commit/18281d9d439e5037ff7ebd7f39566cff147d21bd
Author: Inovea Conseil <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
FIX #6580
FIX #6580
Commit: b41e0a40e7decfd24ea75941043b573bf6060b69
https://github.com/Dolibarr/dolibarr/commit/b41e0a40e7decfd24ea75941043b573bf6060b69
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge pull request #10138 from inoveaconseil/patch-4
FIX #6580
Commit: 474228cbd63ed378f98b10e4174fcc2ec14e8f6c
https://github.com/Dolibarr/dolibarr/commit/474228cbd63ed378f98b10e4174fcc2ec14e8f6c
Author: ATM John BOTELLA <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
FIX #8741
Commit: 13806124b2946cbb4aca827afd01731aefc86f60
https://github.com/Dolibarr/dolibarr/commit/13806124b2946cbb4aca827afd01731aefc86f60
Author: Maxime Kohlhaas <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Fix add missing fk_department and fk_pays in contact/bank imports
Commit: e30bee50a2f4882276f82d5f8e818ef38bbc4c69
https://github.com/Dolibarr/dolibarr/commit/e30bee50a2f4882276f82d5f8e818ef38bbc4c69
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/contact/list.php
Log Message:
-----------
Merge pull request #10139 from atm-john/fix_#8741
FIX #8741
Commit: a49a08362966cd15de4be721d9cafad7eb148d9f
https://github.com/Dolibarr/dolibarr/commit/a49a08362966cd15de4be721d9cafad7eb148d9f
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/core/modules/modSociete.class.php
Log Message:
-----------
Merge pull request #10142 from atm-maxime/fix_import_fk_dept
Fix add missing fk_department and fk_pays in contact/bank imports
Commit: cb9ada2119cee76199327c71f11246b2e4583431
https://github.com/Dolibarr/dolibarr/commit/cb9ada2119cee76199327c71f11246b2e4583431
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/contact/list.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modResource.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/step1.php
M htdocs/product/price.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
Commit: 6d84036f660ec6ecc7756542ecb9698fa5c0ee75
https://github.com/Dolibarr/dolibarr/commit/6d84036f660ec6ecc7756542ecb9698fa5c0ee75
Author: Laurent Destailleur <address@hidden>
Date: 2018-12-01 (Sat, 01 Dec 2018)
Changed paths:
M htdocs/accountancy/bookkeeping/balance.php
M htdocs/comm/action/index.php
M htdocs/contact/list.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formmail.class.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
M htdocs/core/modules/modAdherent.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modProjet.class.php
M htdocs/core/modules/modResource.class.php
M htdocs/core/modules/modService.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/expensereport/card.php
M htdocs/fourn/class/paiementfourn.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/install/step1.php
M htdocs/product/price.php
M htdocs/public/payment/newpayment.php
M htdocs/societe/class/societe.class.php
M htdocs/ticket/class/actions_ticket.class.php
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/0fb95c91a4fa...6d84036f660e
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.