[Dolibarr-git] [Dolibarr/dolibarr] 07bb96: Merge pull request #1 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 07bb968a9c692ffe91ad6879863355575dbba4ad
      
https://github.com/Dolibarr/dolibarr/commit/07bb968a9c692ffe91ad6879863355575dbba4ad
  Author: Cédric <address@hidden>
  Date:   2019-10-22 (Tue, 22 Oct 2019)

  Changed paths:
    M ChangeLog
    M dev/initdata/generate-invoice.php
    M dev/initdata/generate-proposal.php
    M dev/setup/codesniffer/ruleset.xml
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/accountancy/supplier/lines.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/admin/company.php
    M htdocs/admin/mails.php
    M htdocs/api/class/api.class.php
    M htdocs/bom/bom_card.php
    M htdocs/bom/bom_list.php
    M htdocs/bom/class/api_boms.class.php
    M htdocs/bom/class/bom.class.php
    M htdocs/bom/tpl/objectline_view.tpl.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/mailing/info.php
    M htdocs/compta/deplacement/info.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/paiement/class/cpaiement.class.php
    M htdocs/compta/tva/document.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/actions_addupdatedelete.inc.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/cunits.class.php
    M htdocs/core/class/discount.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/lessc.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/loan.lib.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/lib/memory.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/fichinter/mod_arctic.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/core/modules/propale/doc/pdf_cyan.modules.php
    M htdocs/core/tpl/extrafields_list_print_fields.tpl.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    R htdocs/expensereport/export_csv.php
    M htdocs/hrm/admin/admin_hrm.php
    M htdocs/install/lib/repair.lib.php
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    M htdocs/install/mysql/tables/llx_expeditiondet.key.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/boxes.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/mrp.lang
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/modulebuilder/template/myobject_card.php
    A htdocs/mrp/ajax/ajax_bom.php
    M htdocs/mrp/class/mo.class.php
    M htdocs/mrp/index.php
    M htdocs/mrp/mo_agenda.php
    M htdocs/mrp/mo_card.php
    M htdocs/mrp/mo_document.php
    M htdocs/mrp/mo_list.php
    M htdocs/mrp/mo_note.php
    M htdocs/product/admin/price_rules.php
    M htdocs/product/card.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/inventory/inventory.php
    M htdocs/product/inventory/list.php
    M htdocs/product/stats/facture.php
    M htdocs/projet/card.php
    M htdocs/societe/card.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/takepos/admin/receipt.php
    M htdocs/takepos/ajax/ajax.php
    M htdocs/takepos/css/pos.css
    M htdocs/takepos/invoice.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/takepos.php
    M htdocs/theme/eldy/btn.inc.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/md/btn.inc.php
    M htdocs/theme/md/style.css.php
    M htdocs/website/index.php
    M test/phpunit/BOMTest.php

  Log Message:
  -----------
  Merge pull request #1 from Dolibarr/develop

sync 20191022


  Commit: d098efb8fe50b213eb5ab884e6b49e8c3f353275
      
https://github.com/Dolibarr/dolibarr/commit/d098efb8fe50b213eb5ab884e6b49e8c3f353275
  Author: Cédric <address@hidden>
  Date:   2019-10-22 (Tue, 22 Oct 2019)

  Changed paths:
    M htdocs/api/class/api_setup.class.php

  Log Message:
  -----------
  getListOfShipmentMethods: Add rowid field in sql select


  Commit: 24174a0eea87aa52a862fd8cd2413c4f7d855ccf
      
https://github.com/Dolibarr/dolibarr/commit/24174a0eea87aa52a862fd8cd2413c4f7d855ccf
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-22 (Tue, 22 Oct 2019)

  Changed paths:
    M htdocs/api/class/api_setup.class.php

  Log Message:
  -----------
  Merge pull request #12201 from c3do/develop

Fix getListOfShipmentMethods


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5a50dce82e1f...24174a0eea87