[Dolibarr-git] [Dolibarr/dolibarr] 4e9dae: Merge branch 'develop' of https://github.com/Dolib...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4e9dae5129018978bb6657288b0e1e158b9a3f1e
      
https://github.com/Dolibarr/dolibarr/commit/4e9dae5129018978bb6657288b0e1e158b9a3f1e
  Author: Neil Orley <address@hidden>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M dev/examples/ldap/ldapsearch_sample1.txt
    M htdocs/admin/defaultvalues.php
    M htdocs/admin/mails_templates.php
    M htdocs/bookmarks/bookmarks.lib.php
    M htdocs/bookmarks/list.php
    M htdocs/core/class/html.form.class.php
    A htdocs/core/js/lib_foot.js.php
    M htdocs/core/js/lib_head.js.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/main.inc.php

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


  Commit: 73fe991aedd84b49953efe48b2b92983417dac1e
      
https://github.com/Dolibarr/dolibarr/commit/73fe991aedd84b49953efe48b2b92983417dac1e
  Author: Neil Orley <address@hidden>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M htdocs/commande/class/api_orders.class.php

  Log Message:
  -----------
  NEW Return the order object when validate

Return the order object when the order is validated using the REST API


  Commit: 182fe4a90f99fbcc664f2243b5d7f3636e8cd94b
      
https://github.com/Dolibarr/dolibarr/commit/182fe4a90f99fbcc664f2243b5d7f3636e8cd94b
  Author: Neil Orley <address@hidden>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M htdocs/commande/class/api_orders.class.php

  Log Message:
  -----------
  Change HTTP response code when nothing modified


  Commit: c68f717071cba21726653ac9cee4a6ff7df33a1a
      
https://github.com/Dolibarr/dolibarr/commit/c68f717071cba21726653ac9cee4a6ff7df33a1a
  Author: Neil Orley <address@hidden>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M htdocs/commande/class/api_orders.class.php

  Log Message:
  -----------
  NEW Update availability

Add the ability to update availability while updating an invoice using the REST 
API


  Commit: 4dfb0a8f1bf04248536acf77b2a92f8cee98535a
      
https://github.com/Dolibarr/dolibarr/commit/4dfb0a8f1bf04248536acf77b2a92f8cee98535a
  Author: Neil Orley <address@hidden>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

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

  Log Message:
  -----------
  NEW add the ability to regenerate an pdf for the order module

add the ability to regenerate an pdf for the order module


  Commit: d2a67e152bf73d2bbccf250940a7dda04cc28bf3
      
https://github.com/Dolibarr/dolibarr/commit/d2a67e152bf73d2bbccf250940a7dda04cc28bf3
  Author: Neil Orley <address@hidden>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/bookkeeping/card.php
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/accountancy/class/accountingjournal.class.php
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/expensereport/list.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/adherents/list.php
    M htdocs/adherents/subscription/list.php
    M htdocs/adherents/type.php
    M htdocs/admin/agenda.php
    M htdocs/admin/dict.php
    M htdocs/admin/mails_senderprofile_list.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/rapport/index.php
    M htdocs/comm/index.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/list.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/facture/class/api_invoices.class.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/index.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/resultat/index.php
    M htdocs/compta/sociales/class/chargesociales.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services_list.php
    M htdocs/core/actions_massactions.inc.php
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/ajax/row.php
    M htdocs/core/boxes/box_activity.php
    M htdocs/core/boxes/box_external_rss.php
    M htdocs/core/boxes/box_factures_fourn.php
    M htdocs/core/boxes/box_ficheinter.php
    M htdocs/core/boxes/box_members.php
    M htdocs/core/boxes/box_project.php
    M htdocs/core/boxes/box_services_expired.php
    M htdocs/core/boxes/box_supplier_orders.php
    M htdocs/core/boxes/modules_boxes.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/js/lib_foot.js.php
    M htdocs/core/lib/ajax.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/photos_resize.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    R htdocs/core/tpl/massactions_form.tpl.php
    A htdocs/core/tpl/massactions_pre.tpl.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/cron/list.php
    M htdocs/don/class/don.class.php
    M htdocs/don/list.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/class/ecmfiles.class.php
    M htdocs/ecm/class/htmlecm.form.class.php
    M htdocs/ecm/docdir.php
    M htdocs/ecm/docfile.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/enablefiletreeajax.tpl.php
    M htdocs/ecm/tpl/filemanager.tpl.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/fichinter/list.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/product/list.php
    M htdocs/holiday/list.php
    M htdocs/hrm/index.php
    M htdocs/index.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/install/mysql/tables/llx_facture_rec.sql
    M htdocs/langs/en_US/bills.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/en_US/ecm.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/interventions.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/opensurvey.lang
    M htdocs/langs/en_US/orders.lang
    M htdocs/main.inc.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/list.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/dynamic_price/class/price_expression.class.php
    M htdocs/product/dynamic_price/class/price_global_variable.class.php
    M htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
    M htdocs/product/dynamic_price/class/price_parser.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/public/payment/newpayment.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/resource/list.php
    M htdocs/societe/class/api_contacts.class.php
    M htdocs/societe/document.php
    M htdocs/societe/list.php
    M htdocs/societe/website.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/supplier_proposal/list.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/document.php
    M htdocs/user/index.php
    M htdocs/variants/combinations.php
    M htdocs/website/index.php

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


  Commit: bf05a0b8e005353774318c33f86b59c9754a4144
      
https://github.com/Dolibarr/dolibarr/commit/bf05a0b8e005353774318c33f86b59c9754a4144
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M htdocs/commande/class/api_orders.class.php

  Log Message:
  -----------
  Update api_orders.class.php


  Commit: 4212000cafde2965b61a39f1061c5088d23b7618
      
https://github.com/Dolibarr/dolibarr/commit/4212000cafde2965b61a39f1061c5088d23b7618
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M htdocs/commande/class/api_orders.class.php

  Log Message:
  -----------
  Update api_orders.class.php


  Commit: 765a2097bcdc85b75316c2e135959e7d1ffe5c0b
      
https://github.com/Dolibarr/dolibarr/commit/765a2097bcdc85b75316c2e135959e7d1ffe5c0b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M htdocs/api/class/api_documents.class.php
    M htdocs/commande/class/api_orders.class.php

  Log Message:
  -----------
  Merge pull request #7804 from Oeris/develop-api

NEW Update in the order REST API


Compare: 
https://github.com/Dolibarr/dolibarr/compare/010e542fe444...765a2097bcdc