[Dolibarr-git] [Dolibarr/dolibarr] 99fb9b: Merge remote-tracking branch 'refs/remotes/Dolibar...

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 99fb9b7e0e9f18134a4db56ac0121c1a9de515e2
      
https://github.com/Dolibarr/dolibarr/commit/99fb9b7e0e9f18134a4db56ac0121c1a9de515e2
  Author: fappels <address@hidden>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M htdocs/cashdesk/tpl/facturation1.tpl.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0


  Commit: 76bd5e009adab4167031ae7b982d225e07b6103d
      
https://github.com/Dolibarr/dolibarr/commit/76bd5e009adab4167031ae7b982d225e07b6103d
  Author: fappels <address@hidden>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M ChangeLog
    M dev/initdemo/initdemo.sh
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/bookmarks/card.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/bankentries.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/contact/agenda.php
    M htdocs/contact/card.php
    M htdocs/contact/list.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/list.php
    M htdocs/core/class/commonobject.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/html.formmargin.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security.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/mailings/advthirdparties.modules.php
    M htdocs/core/modules/mailings/contacts1.modules.php
    M htdocs/core/modules/mailings/contacts2.modules.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/example.modules.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/mailings/framboise.modules.php
    M htdocs/core/modules/mailings/modules_mailings.php
    M htdocs/core/modules/mailings/pomme.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
    M htdocs/core/modules/mailings/xinputfile.modules.php
    M htdocs/core/modules/mailings/xinputuser.modules.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/product/mod_codeproduct_elephant.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/tpl/objectline_view.tpl.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/class/paymentexpensereport.class.php
    M htdocs/expensereport/list.php
    M htdocs/exports/export.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/commande/info.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/index.php
    M htdocs/install/mysql/tables/llx_expensereport.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/main.inc.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/checkMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/lib/margins.lib.php
    M htdocs/margin/productMargins.php
    M htdocs/product/card.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/element.php
    M htdocs/projet/info.php
    M htdocs/public/demo/index.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/resource/list.php
    M htdocs/societe/agenda.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/list.php
    M htdocs/societe/soc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/document.php
    M htdocs/user/group/index.php
    M htdocs/user/index.php

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0


  Commit: a84c6f9b454e43c8261cfa42ffbc7907834f45db
      
https://github.com/Dolibarr/dolibarr/commit/a84c6f9b454e43c8261cfa42ffbc7907834f45db
  Author: fappels <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/product/fournisseurs.php

  Log Message:
  -----------
  Qual reputation for price supplier

Move available reputation constants from view-controller to class


  Commit: b1fe8e3f2bb1718315145273bed80b0dc60329b3
      
https://github.com/Dolibarr/dolibarr/commit/b1fe8e3f2bb1718315145273bed80b0dc60329b3
  Author: fappels <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/product/fournisseurs.php

  Log Message:
  -----------
  fix merge


  Commit: e0850b29cd4356ea3d09edf374c1d046aa6f329a
      
https://github.com/Dolibarr/dolibarr/commit/e0850b29cd4356ea3d09edf374c1d046aa6f329a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-02-08 (Wed, 08 Feb 2017)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/product/fournisseurs.php

  Log Message:
  -----------
  Merge pull request #6399 from fappels/5.0

Qual reputation for price supplier


Compare: 
https://github.com/Dolibarr/dolibarr/compare/104c8ae2435d...e0850b29cd43