[Dolibarr-git] [Dolibarr/dolibarr] e5fa7c: Merge branch 'develop' of github.com:Dolibarr/doli...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e5fa7cd0a9a503e277d28b6f37d2308f7acfbc36
      
https://github.com/Dolibarr/dolibarr/commit/e5fa7cd0a9a503e277d28b6f37d2308f7acfbc36
  Author: Marc de Lima Lucio <address@hidden>
  Date:   2018-04-04 (Wed, 04 Apr 2018)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    M htdocs/adherents/list.php
    M htdocs/admin/accountant.php
    M htdocs/admin/company.php
    M htdocs/admin/ihm.php
    M htdocs/comm/action/list.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/list.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement.php
    M htdocs/compta/paiement/card.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services_list.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/js/lib_head.js.php
    M htdocs/core/tpl/extrafields_list_search_title.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/list.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/holiday/define_holiday.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_inventory.sql
    M htdocs/langs/en_US/stocks.lang
    M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/inventory/card.php
    M htdocs/product/inventory/class/inventory.class.php
    M htdocs/product/inventory/list.php
    M htdocs/product/list.php
    M htdocs/product/stock/mouvement.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/time.php
    M htdocs/resource/list.php
    M htdocs/societe/class/companypaymentmode.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/list.php
    M htdocs/societe/website.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/supplier_proposal/list.php
    M htdocs/ticketsup/list.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/card.php
    M htdocs/user/document.php
    M htdocs/user/group/card.php
    M htdocs/user/group/perms.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/user/ldap.php
    M htdocs/user/note.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop


  Commit: 3b6a756cd83c28bc4e00feeddecb0b6b16145550
      
https://github.com/Dolibarr/dolibarr/commit/3b6a756cd83c28bc4e00feeddecb0b6b16145550
  Author: Marc de Lima Lucio <address@hidden>
  Date:   2018-04-09 (Mon, 09 Apr 2018)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/journals_list.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyaccount.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/accountingjournal.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/adherents/index.php
    M htdocs/adherents/list.php
    M htdocs/adherents/subscription/list.php
    M htdocs/adherents/type.php
    M htdocs/admin/company.php
    A htdocs/admin/dav.php
    M htdocs/admin/dict.php
    M htdocs/admin/mails.php
    M htdocs/admin/mails_templates.php
    M htdocs/admin/modules.php
    M htdocs/admin/payment.php
    M htdocs/admin/translation.php
    M htdocs/admin/website.php
    A htdocs/assets/admin/assets_extrafields.php
    A htdocs/assets/admin/assets_type_extrafields.php
    A htdocs/assets/admin/setup.php
    A htdocs/assets/card.php
    A htdocs/assets/class/asset.class.php
    A htdocs/assets/class/asset_type.class.php
    A htdocs/assets/document.php
    A htdocs/assets/info.php
    A htdocs/assets/list.php
    A htdocs/assets/note.php
    A htdocs/assets/type.php
    M htdocs/bookmarks/list.php
    M htdocs/comm/action/class/api_agendaevents.class.php
    M htdocs/comm/action/list.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/comm/remise.php
    M htdocs/commande/card.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/bank/list.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/transfer.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/localtax/clients.php
    M htdocs/compta/localtax/index.php
    M htdocs/compta/localtax/list.php
    M htdocs/compta/localtax/quadri_detail.php
    M htdocs/compta/tva/clients.php
    M htdocs/compta/tva/index.php
    M htdocs/compta/tva/list.php
    M htdocs/compta/tva/quadri.php
    M htdocs/compta/tva/quadri_detail.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/ajax/selectsearchbox.php
    M htdocs/core/class/CMailFile.class.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/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    A htdocs/core/lib/assets.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/tax.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    A htdocs/core/modules/modAssets.class.php
    M htdocs/core/modules/modCron.class.php
    M htdocs/core/modules/modDav.class.php
    M htdocs/core/modules/modStripe.class.php
    M htdocs/core/search.php
    A htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
    M htdocs/core/tpl/card_presend.tpl.php
    M htdocs/core/tpl/object_discounts.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/cron/card.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/cron/list.php
    M htdocs/dav/dav.lib.php
    M htdocs/don/list.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/list.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/list.php
    M htdocs/holiday/list.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_accounting_abc.sql
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_account.key.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    A htdocs/install/mysql/tables/llx_asset.key.sql
    A htdocs/install/mysql/tables/llx_asset.sql
    A htdocs/install/mysql/tables/llx_asset_extrafields.sql
    A htdocs/install/mysql/tables/llx_asset_type.key.sql
    A htdocs/install/mysql/tables/llx_asset_type.sql
    A htdocs/install/mysql/tables/llx_asset_type_extrafields.key.sql
    A htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    A htdocs/langs/en_US/assets.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/main.inc.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/opensurvey/list.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/inventory/list.php
    M htdocs/product/list.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stock/list.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/mouvement.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/card.php
    M htdocs/public/opensurvey/studs.php
    M htdocs/resource/list.php
    M htdocs/societe/card.php
    M htdocs/societe/class/societe.class.php
    M htdocs/stripe/charge.php
    A htdocs/stripe/payment.php
    M htdocs/stripe/transaction.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/agenda_extsites.php
    M htdocs/user/bank.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/clicktodial.php
    M htdocs/user/document.php
    M htdocs/user/group/card.php
    R htdocs/user/group/index.php
    M htdocs/user/group/ldap.php
    A htdocs/user/group/list.php
    M htdocs/user/group/perms.php
    M htdocs/user/hierarchy.php
    R htdocs/user/index.php
    M htdocs/user/info.php
    M htdocs/user/ldap.php
    A htdocs/user/list.php
    M htdocs/user/note.php
    M htdocs/user/notify/card.php
    M htdocs/user/param_ihm.php
    M htdocs/user/perms.php
    M scripts/cron/cron_run_jobs.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop


  Commit: cdcfe8e3561853b4155436785f989f9d9935b506
      
https://github.com/Dolibarr/dolibarr/commit/cdcfe8e3561853b4155436785f989f9d9935b506
  Author: Marc de Lima Lucio <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/assets/class/asset_type.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/actions_sendmails.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/don/class/don.class.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/shipment.php
    M htdocs/expensereport/card.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/card.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_extrafields.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/livraison/card.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/productlot_card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/public/members/new.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/ticketsup/class/ticketsup.class.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop


  Commit: 7aa4d16eef24242142044ce4534bf282cc54293a
      
https://github.com/Dolibarr/dolibarr/commit/7aa4d16eef24242142044ce4534bf282cc54293a
  Author: Marc de Lima Lucio <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked


  Commit: 273eadab434e403dab4eed448720cf4e020cae50
      
https://github.com/Dolibarr/dolibarr/commit/273eadab434e403dab4eed448720cf4e020cae50
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-04-11 (Wed, 11 Apr 2018)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby

NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e393e8b81326...273eadab434e