[Dolibarr/dolibarr] 7de9a9: Merge pull request #5 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7de9a94624de3e391049c9bbf62572ee4bee0f09
      
https://github.com/Dolibarr/dolibarr/commit/7de9a94624de3e391049c9bbf62572ee4bee0f09
  Author: Tobias Sekan <address@hidden>
  Date:   2020-01-16 (Thu, 16 Jan 2020)

  Changed paths:
    M .travis.yml
    M build/debian/conf.php.install
    M build/debian/source/include-binaries
    M build/exe/doliwamp/doliwamp.iss
    M build/generate_filelist_xml.php
    A dev/initdata/dbf/import-dbf.php
    A dev/initdata/dbf/importdb-products.php
    A dev/initdata/dbf/importdb-thirdparties.php
    A dev/initdata/dbf/includes/dbase.class.php
    M dev/initdata/generate-invoice.php
    M dev/initdata/generate-order.php
    M dev/initdata/generate-product.php
    M dev/initdata/generate-proposal.php
    M dev/initdata/generate-thirdparty.php
    M dev/initdata/import-products.php
    M dev/initdata/import-thirdparties.php
    M dev/initdata/import-users.php
    M dev/setup/codesniffer/ruleset.xml
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/adherents/card.php
    M htdocs/adherents/subscription.php
    M htdocs/adherents/type.php
    M htdocs/admin/company.php
    M htdocs/admin/modules.php
    M htdocs/admin/system/phpinfo.php
    M htdocs/admin/tools/dolibarr_export.php
    M htdocs/categories/class/api_categories.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/categories/index.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/various_payment/list.php
    M htdocs/compta/facture/list.php
    M htdocs/contact/card.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/dolgraph.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    R htdocs/core/modules/export/export_excel.modules.php
    R htdocs/core/modules/export/export_excel2007.modules.php
    M htdocs/core/modules/modAgenda.class.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/core/modules/modSupplierProposal.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/expedition/list.php
    M htdocs/exports/class/export.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/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/fourn/facture/note.php
    M htdocs/holiday/card.php
    M htdocs/install/check.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/migration/10.0.0-11.0.0.sql
    M htdocs/install/mysql/migration/11.0.0-12.0.0.sql
    M htdocs/install/mysql/tables/llx_bookmark.key.sql
    M htdocs/install/mysql/tables/llx_bookmark.sql
    A htdocs/install/mysql/tables/llx_categorie_actioncomm.key.sql
    A htdocs/install/mysql/tables/llx_categorie_actioncomm.sql
    M htdocs/install/mysql/tables/llx_facture_rec.sql
    M htdocs/langs/en_US/categories.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/en_US/install.lang
    M htdocs/langs/en_US/modulebuilder.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/loan/card.php
    M htdocs/loan/list.php
    M htdocs/main.inc.php
    M htdocs/modulebuilder/index.php
    M htdocs/mrp/lib/mrp_mo.lib.php
    M htdocs/mrp/mo_card.php
    M htdocs/product/card.php
    M htdocs/product/list.php
    M htdocs/product/stats/card.php
    M htdocs/product/stock/card.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/projet/card.php
    M htdocs/projet/comment.php
    M htdocs/projet/contact.php
    M htdocs/projet/element.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/note.php
    M htdocs/projet/tasks/task.php
    M htdocs/projet/tasks/time.php
    M htdocs/salaries/list.php
    M htdocs/societe/card.php
    M htdocs/societe/class/api_thirdparties.class.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/supplier_proposal/list.php
    M htdocs/user/card.php
    M htdocs/website/class/websitepage.class.php
    M test/phpunit/ExportTest.php

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

Get current develop


  Commit: bbd7900fc7885013c7e17607c4b5e1144dc50e12
      
https://github.com/Dolibarr/dolibarr/commit/bbd7900fc7885013c7e17607c4b5e1144dc50e12
  Author: Tobias Sekan <address@hidden>
  Date:   2020-01-16 (Thu, 16 Jan 2020)

  Changed paths:
    M htdocs/comm/action/index.php

  Log Message:
  -----------
  Show holidays in agenda


  Commit: 72e227a543e290ddd2acb72b0286a16f03378cda
      
https://github.com/Dolibarr/dolibarr/commit/72e227a543e290ddd2acb72b0286a16f03378cda
  Author: Tobias Sekan <address@hidden>
  Date:   2020-01-16 (Thu, 16 Jan 2020)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Add link to leave request for holidays in agenda


  Commit: b79c6fc84886f35eee49b0bf8c532a5d9ce07831
      
https://github.com/Dolibarr/dolibarr/commit/b79c6fc84886f35eee49b0bf8c532a5d9ce07831
  Author: Tobias Sekan <address@hidden>
  Date:   2020-01-16 (Thu, 16 Jan 2020)

  Changed paths:
    M htdocs/langs/de_DE/holiday.lang

  Log Message:
  -----------
  Update German language


  Commit: eca59220d8dd2b260e93244c459f7cc3df02903b
      
https://github.com/Dolibarr/dolibarr/commit/eca59220d8dd2b260e93244c459f7cc3df02903b
  Author: stickler-ci <address@hidden>
  Date:   2020-01-16 (Thu, 16 Jan 2020)

  Changed paths:
    M htdocs/comm/action/index.php

  Log Message:
  -----------
  Fixing style errors.


  Commit: f06f15de2e29480109712c137643af2f65d618f9
      
https://github.com/Dolibarr/dolibarr/commit/f06f15de2e29480109712c137643af2f65d618f9
  Author: Laurent Destailleur <address@hidden>
  Date:   2020-01-22 (Wed, 22 Jan 2020)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/index.php
    M htdocs/langs/de_DE/holiday.lang

  Log Message:
  -----------
  Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda

New: Show holidays in the agenda view (month, week, day)


Compare: 
https://github.com/Dolibarr/dolibarr/compare/57569604b23d...f06f15de2e29