[Dolibarr/dolibarr] 0ef3de: Try to fix conflict of several stripe accounts

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0ef3de98c67f9dcdff50ef4fba6df3e9ba83dc0c
      
https://github.com/Dolibarr/dolibarr/commit/0ef3de98c67f9dcdff50ef4fba6df3e9ba83dc0c
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-15 (Sun, 15 Dec 2019)

  Changed paths:
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    M htdocs/install/mysql/tables/llx_societe_account.sql
    M htdocs/societe/class/societeaccount.class.php
    M htdocs/societe/paymentmodes.php
    M htdocs/stripe/class/stripe.class.php

  Log Message:
  -----------
  Try to fix conflict of several stripe accounts


  Commit: cb71d5a7bba201b48c9fcc65bc89d4d8c282d268
      
https://github.com/Dolibarr/dolibarr/commit/cb71d5a7bba201b48c9fcc65bc89d4d8c282d268
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-15 (Sun, 15 Dec 2019)

  Changed paths:
    M build/README
    M build/doxygen/dolibarr-doxygen-build.pl
    M build/doxygen/dolibarr-doxygen-filter.pl
    M build/generate_filelist_xml.php
    M htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
    M htdocs/adherents/document.php
    M htdocs/adherents/subscription.php
    M htdocs/adherents/subscription/info.php
    M htdocs/admin/bank_extrafields.php
    M htdocs/admin/commande.php
    M htdocs/admin/commande_fournisseur_dispatch_extrafields.php
    M htdocs/admin/system/filecheck.php
    M htdocs/admin/ticket.php
    M htdocs/api/admin/explorer.php
    M htdocs/api/class/api_setup.class.php
    M htdocs/asset/admin/assets_extrafields.php
    M htdocs/bookmarks/card.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/info.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/various_payment/card.php
    M htdocs/compta/cashcontrol/cashcontrol_card.php
    M htdocs/compta/facture/admin/facture_cust_extrafields.php
    M htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_cust_extrafields.php
    M htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/paiement/card.php
    M htdocs/compta/paiement/class/cpaiement.class.php
    M htdocs/compta/paiement/info.php
    M htdocs/compta/prelevement/class/rejetprelevement.class.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/resultat/result.php
    M htdocs/compta/stats/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/boxes/box_birthdays_members.php
    M htdocs/core/boxes/box_last_ticket.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formticket.class.php
    M htdocs/core/class/notify.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/class/workboardresponse.class.php
    M htdocs/core/db/sqlite3.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functionsnumtoword.lib.php
    M htdocs/core/modules/cheque/mod_chequereceipt_mint.php
    M htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
    M htdocs/core/modules/export/export_excel2007new.modules.php
    M htdocs/core/modules/fichinter/mod_arctic.php
    M htdocs/core/modules/modEmailCollector.class.php
    M htdocs/core/modules/societe/mod_codecompta_digitaria.php
    M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    M htdocs/don/admin/donation.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/class/fichinterrec.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/install/upgrade2.php
    M htdocs/livraison/card.php
    M htdocs/loan/calcmens.php
    M htdocs/loan/card.php
    M htdocs/loan/document.php
    M htdocs/loan/info.php
    M htdocs/loan/note.php
    M htdocs/loan/schedule.php
    M 
htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
    M htdocs/mrp/ajax/ajax_bom.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/info.php
    M htdocs/product/stock/lib/replenishment.lib.php
    M htdocs/product/stock/movement_card.php
    M htdocs/product/stock/movement_list.php
    M htdocs/projet/admin/project.php
    M htdocs/reception/class/reception.class.php
    M htdocs/reception/contact.php
    M htdocs/reception/note.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/paymentmodes.php
    M htdocs/societe/price.php
    M htdocs/stripe/payment.php
    M htdocs/takepos/send.php
    M htdocs/takepos/takepos.php
    M htdocs/ticket/card.php
    M htdocs/user/admin/group_extrafields.php
    M htdocs/user/admin/user_extrafields.php
    M htdocs/user/bank.php
    M htdocs/user/class/user.class.php
    M htdocs/user/param_ihm.php
    M htdocs/variants/combinations.php
    M htdocs/zapier/class/api_zapier.class.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/70fcb68a7dd5...cb71d5a7bba2