[Dolibarr-git] [Dolibarr/dolibarr] 51df25: Fix conflicts on default doc template when enablin...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 51df25509ebfa6f9fb63d58a9d1c6f04a5da839d
      
https://github.com/Dolibarr/dolibarr/commit/51df25509ebfa6f9fb63d58a9d1c6f04a5da839d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-10-02 (Sun, 02 Oct 2016)

  Changed paths:
    M htdocs/core/modules/modAdherent.class.php
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modDon.class.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/core/modules/modExpenseReport.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modFicheinter.class.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/modPrelevement.class.php
    M htdocs/core/modules/modProjet.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modSupplierProposal.class.php

  Log Message:
  -----------
  Fix conflicts on default doc template when enabling/disabling modules


  Commit: 45a808e0345bc214db3128e5e9db7cdd12464629
      
https://github.com/Dolibarr/dolibarr/commit/45a808e0345bc214db3128e5e9db7cdd12464629
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-10-03 (Mon, 03 Oct 2016)

  Changed paths:
    M htdocs/adherents/agenda.php
    M htdocs/adherents/card.php
    M htdocs/adherents/cartes/carte.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/document.php
    R htdocs/adherents/info.php
    M htdocs/adherents/subscription/card.php
    M htdocs/adherents/subscription/info.php
    M htdocs/adherents/subscription/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/member.lib.php
    M htdocs/core/modules/member/doc/pdf_standard.class.php
    M htdocs/core/modules/member/modules_cards.php
    M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql

  Log Message:
  -----------
  NEW Generation of document is available on member card


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0d9f28bd616b...45a808e0345b