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

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9c58bfafdd81794f1773a0b3448255559b87851a
      
https://github.com/Dolibarr/dolibarr/commit/9c58bfafdd81794f1773a0b3448255559b87851a
  Author: florian HENRY <address@hidden>
  Date:   2018-03-19 (Mon, 19 Mar 2018)

  Changed paths:
    M htdocs/adherents/tpl/linkedobjectblock.tpl.php
    M htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
    M htdocs/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
    M htdocs/compta/prelevement/ligne.php
    M htdocs/contrat/card.php
    M htdocs/contrat/tpl/linkedobjectblock.tpl.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formticketsup.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/tpl/admin_extrafields_edit.tpl.php
    M htdocs/core/tpl/admin_extrafields_view.tpl.php
    M htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/expensereport/tpl/linkedobjectblock.tpl.php
    M htdocs/fichinter/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/install/mysql/data/llx_00_c_country.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/langs/en_US/ticketsup.lang
    M htdocs/langs/en_US/withdrawals.lang
    M htdocs/loan/card.php
    M htdocs/loan/class/loan.class.php
    M htdocs/main.inc.php
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/product/index.php
    M htdocs/product/list.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/mouvement.php
    M htdocs/projet/list.php
    M htdocs/societe/paymentmodes.php
    M htdocs/stripe/class/stripe.class.php
    M htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/ticketsup/card.php
    M htdocs/ticketsup/class/actions_ticketsup.class.php
    M htdocs/ticketsup/class/ticketsup.class.php
    M htdocs/ticketsup/contact.php
    M htdocs/ticketsup/document.php
    M htdocs/ticketsup/history.php
    M htdocs/ticketsup/index.php
    M htdocs/ticketsup/list.php
    M htdocs/ticketsup/new.php

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


  Commit: 6cd5d12a3170efb7f8a862f7f6b97134cfed90ef
      
https://github.com/Dolibarr/dolibarr/commit/6cd5d12a3170efb7f8a862f7f6b97134cfed90ef
  Author: florian HENRY <address@hidden>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

  Changed paths:
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/adherents/class/adherent.class.php
    A htdocs/admin/accountant.php
    M htdocs/admin/company.php
    M htdocs/commande/document.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/contrat/card.php
    M htdocs/core/actions_builddoc.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/photos_resize.php
    M htdocs/core/tpl/contacts.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/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/list.php
    A htdocs/holiday/month_report.php
    M htdocs/holiday/view_log.php
    M htdocs/hrm/index.php
    M htdocs/install/step5.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/margins.lang
    M htdocs/langs/en_US/stripe.lang
    M htdocs/langs/en_US/ticketsup.lang
    M htdocs/langs/en_US/trips.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/list.php
    M htdocs/public/payment/newpayment.php
    M htdocs/public/stripe/newpayment.php
    M htdocs/societe/card.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/ticketsup/document.php
    M htdocs/user/group/card.php

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


  Commit: d959905e4f878ecd96a0fd5e619b604e79fadcc9
      
https://github.com/Dolibarr/dolibarr/commit/d959905e4f878ecd96a0fd5e619b604e79fadcc9
  Author: florian HENRY <address@hidden>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

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

  Log Message:
  -----------
  fix scrutinizer


  Commit: 10d7e7d289a339f231c7957c2c8981da8a949e8f
      
https://github.com/Dolibarr/dolibarr/commit/10d7e7d289a339f231c7957c2c8981da8a949e8f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-21 (Wed, 21 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #8425 from atm-florian/dev_scrunit

Dev scrunit


Compare: 
https://github.com/Dolibarr/dolibarr/compare/423bd56646f7...10d7e7d289a3